Library children object fix

tool/input_sdk/private/debugger.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart._debugger;
 
 import 'dart:_foreign_helper' show JS;
 import 'dart:_runtime' as dart;
 import 'dart:core';
 import 'dart:collection';
@@ skipping 191 matching lines @@
 }
 
 Object safeGetProperty(Object protoChain, String name) {
   try {
     return JSNative.getProperty(protoChain, name);
   } catch (e) {
     return '<Exception thrown> $e';
   }
 }
 
+safeProperties(object) => new Map.fromIterable(
+    getOwnPropertyNames(object)
+        .where((each) => safeGetProperty(object, each) != null),
+    key: (name) => name,
+    value: (name) => safeGetProperty(object, name));
+
 /// Class to simplify building the JsonML objects expected by the
 /// Devtools Formatter API.
 class JsonMLElement {
   dynamic _attributes;
   List _jsonML;
 
   JsonMLElement(tagName) {
     _attributes = JS('', '{}');
     _jsonML = [tagName, _attributes];
   }
@@ skipping 311 matching lines @@
       name = '${name.replaceAll("__", "/")}.dart';
       children.add(new NameValuePair(
           name: name, value: new Library(name, value), hideName: true));
     }
     return children.toList();
   }
 }
 
 /// Formatter for Dart Library objects.
 class LibraryFormatter extends ObjectFormatter {
-  String genericName;
-  String genericArguments;
+  var genericParameters = new HashMap<String, String>();
 
   accept(object) => object is Library;
 
   bool hasChildren(object) => true;
 
   String preview(object) => object.name;
 
   List<NameValuePair> children(object) {
     var children = new LinkedHashSet<NameValuePair>();
-    var entry = object.object;
-    for (var name in getOwnPropertyNames(entry)) {
-      var value = safeGetProperty(entry, name);
-      if (value != null) {
-        var genericTypeConstructor = dart.getGenericTypeCtor(value);
-        if (genericTypeConstructor != null) {
-          genericName = name;
-          // Using JS toString() eliminates the leading metadata that is generated
-          // with the toString function provided in operations.dart.
-          // Splitting by => and taking the first element gives the list of
-          // arguments in the constructor.
-          genericArguments =
-              JS('String', '#.toString()', genericTypeConstructor)
-                  .split(' =>')
-                  .first
-                  .replaceAll(new RegExp(r'[(|)]'), '');
-        } else if (value is Type) {
-          var typeName = getTypeName(value);
-          // Generic class names are generated with a $ at the end, so the
-          // corresponding non-generic class can be identified by adding $.
-          if ('$name\$' == genericName) {
-            typeName = '$typeName<$genericArguments>';
-          }
-          children.add(new NameValuePair(
-              name: typeName, value: new ClassMetadata(value, name: typeName)));
-        } else {
-          children.add(
-              new NameValuePair(name: name, value: new ClassMetadata(value)));
-        }
+    var nonGenericProperties = new LinkedHashMap<String, Object>();
+    var objectProperties = safeProperties(object.object);
+    objectProperties.forEach((name, value) {
+      var genericTypeConstructor = dart.getGenericTypeCtor(value);
+      if (genericTypeConstructor != null) {
+        recordGenericParameters(name, genericTypeConstructor);
+      } else {
+        nonGenericProperties[name] = value;
       }
+    });
+    nonGenericProperties.forEach((name, value) {
+      if (value is Type) {
+        children.add(classChild(name, value));
+      } else {
+        children.add(new NameValuePair(name: name, value: value));
+      }
+    });
+    return children.toList();
+  }
+
+  recordGenericParameters(String name, Object genericTypeConstructor) {
+    // Using JS toString() eliminates the leading metadata that is generated
+    // with the toString function provided in operations.dart.
+    // Splitting by => and taking the first element gives the list of
+    // arguments in the constructor.
+    genericParameters[name] =
+        JS('String', '#.toString()', genericTypeConstructor)
+            .split(' =>')
+            .first
+            .replaceAll(new RegExp(r'[(|)]'), '');
+  }
+
+  classChild(String name, Object child) {
+    var typeName = getTypeName(child);
+    // Generic class names are generated with a $ at the end, so the
+    // corresponding non-generic class can be identified by adding $.
+    var parameterName = '$name\$';
+    if (genericParameters.keys.contains(parameterName)) {
+      typeName = '$typeName<${genericParameters[parameterName]}>';
     }
-    return children.toList();
+    return new NameValuePair(
+        name: typeName, value: new ClassMetadata(child, name: typeName));
   }
 }
 
 /// Formatter for Dart Function objects.
 /// Dart functions happen to be regular JavaScript Function objects but
 /// we can distinguish them based on whether they have been tagged with
 /// runtime type information.
 class FunctionFormatter extends Formatter {
   accept(object) {
     if (_typeof(object) != 'function') return false;
@@ skipping 223 matching lines @@
 
   List<NameValuePair> children(object) => object.children();
 }
 
 /// This entry point is automatically invoked by the code generated by
 /// Dart Dev Compiler
 registerDevtoolsFormatter() {
   var formatters = [_devtoolsFormatter];
   JS('', 'dart.global.devtoolsFormatters = #', formatters);
 }