lib/runtime/dart_sdk.js

Index: lib/runtime/dart_sdk.js
diff --git a/lib/runtime/dart_sdk.js b/lib/runtime/dart_sdk.js
index 120ac2235804270af3d941d8ecb8d1f3391d585d..1a6ca9be5cb54617526d0bb3a40951cede30ea6a 100644
--- a/lib/runtime/dart_sdk.js
+++ b/lib/runtime/dart_sdk.js
@@ -2856,22 +2856,34 @@ dart_library.library('dart_sdk', null, /* Imports */[
         if (value != null) {
           let genericTypeConstructor = dart.getGenericTypeCtor(value);
           if (genericTypeConstructor != null) {
-            this.genericName = name;
-            this.genericArguments = genericTypeConstructor.toString()[dartx.split](' =>')[dartx.first][dartx.replaceAll](core.RegExp.new('[(|)]'), '');
+            this.genericClassHandler(name, genericTypeConstructor);
           } else if (core.Type.is(value)) {
-            let typeName = _debugger.getTypeName(value);
-            if (dart.str`${name}\$` == this.genericName) {
-              typeName = dart.str`${typeName}<${this.genericArguments}>`;
-            }
-            children.add(new _debugger.NameValuePair({name: typeName, value: new _debugger.ClassMetadata(value, {name: typeName})}));
+            this.addClassChild(name, value, children);
           } else {
-            children.add(new _debugger.NameValuePair({name: name, value: new _debugger.ClassMetadata(value)}));
+            children.add(new _debugger.NameValuePair({name: name, value: value}));
           }
         }
       }
       return children.toList();
     }
+    genericClassHandler(name, genericTypeConstructor) {
+      this.genericName = name;
+      this.genericArguments = genericTypeConstructor.toString()[dartx.split](' =>')[dartx.first][dartx.replaceAll](core.RegExp.new('[(|)]'), '');
+    }
+    addClassChild(name, child, children) {
+      let typeName = _debugger.getTypeName(core.Type._check(child));
+      if (dart.str`${name}\$` == this.genericName) {
+        typeName = dart.str`${typeName}<${this.genericArguments}>`;
+      }
+      children.add(new _debugger.NameValuePair({name: typeName, value: new _debugger.ClassMetadata(child, {name: typeName})}));
+    }
   };
+  dart.setSignature(_debugger.LibraryFormatter, {
+    methods: () => ({
+      genericClassHandler: dart.definiteFunctionType(dart.dynamic, [core.String, core.Object]),
+      addClassChild: dart.definiteFunctionType(dart.dynamic, [core.String, core.Object, collection.LinkedHashSet$(_debugger.NameValuePair)])
+    })
+  });
   _debugger.FunctionFormatter = class FunctionFormatter extends _debugger.Formatter {
     accept(object) {
       if (_debugger._typeof(object) != 'function') return false;