Fixed type error in MapEntry and added keyToStringConfig to display the toString() of a key in a Ma…

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';
 import 'dart:html' as html;
 
-/// Config object to pass to devtools to signal that an object should not be
-/// formatted by the Dart formatter. This is used to specify that an Object
+/// JsonMLConfig object to pass to devtools to specify how an Object should
+/// be displayed. skipDart signals that an object should not be formatted
+/// by the Dart formatter. This is used to specify that an Object
 /// should just be displayed using the regular JavaScript view instead of a
 /// custom Dart view. For example, this is used to display the JavaScript view
-/// of a Dart Function as a child of the regular Function object.
-const skipDartConfig = const Object();
+/// of a Dart Function as a child of the regular Function object. keyToString
+/// signals that a map key object should have its toString() displayed by
+/// the Dart formatter.
+///
+/// We'd like this to be an enum, but we can't because it's a dev_compiler bug.
+class JsonMLConfig {
+  const JsonMLConfig(this.name);
+
+  final String name;
+  static const none = const JsonMLConfig("none");
+  static const skipDart = const JsonMLConfig("skipDart");
+  static const keyToString = const JsonMLConfig("keyToString");
+}
+
 final int maxIterableChildrenToDisplay = 50;
 
 var _devtoolsFormatter = new JsonMLFormatter(new DartFormatter());
 
 String _typeof(object) => JS('String', 'typeof #', object);
 
 List<String> getOwnPropertyNames(object) => JS('List<String>',
     'dart.list(Object.getOwnPropertyNames(#), #)', object, String);
 
 List getOwnPropertySymbols(object) =>
@@ skipping 49 matching lines @@
 bool hasMethod(object, String name) {
   try {
     return dart.hasMethod(object, name);
   } catch (e) {
     return false;
   }
 }
 
 /// [JsonMLFormatter] consumes [NameValuePair] objects and
 class NameValuePair {
-  NameValuePair({this.name, this.value, bool skipDart})
-      : skipDart = skipDart == true;
+  NameValuePair({this.name, this.value, this.config: JsonMLConfig.none});
 
   // Define equality and hashCode so that NameValuePair can be used
   // in a Set to dedupe entries with duplicate names.
   operator ==(other) => other is NameValuePair && other.name == name;
   int get hashCode => name.hashCode;
 
   final String name;
   final Object value;
-  final bool skipDart;
+  final JsonMLConfig config;
 }
 
 class MapEntry {
   MapEntry({this.key, this.value});
 
-  final String key;
+  final Object key;
   final Object value;
 }
 
 class ClassMetadata {
   ClassMetadata(this.object);
 
   final Object object;
 }
 
 class HeritageClause {
@@ skipping 71 matching lines @@
   // TODO(jacobr): define a SimpleFormatter base class that DartFormatter
   // implements if we decide to use this class elsewhere. We specify that the
   // type is DartFormatter here purely to get type checking benefits not because
   // this class is really intended to only support instances of type
   // DartFormatter.
   DartFormatter _simpleFormatter;
 
   JsonMLFormatter(this._simpleFormatter);
 
   header(object, config) {
-    if (identical(config, skipDartConfig) || isNativeJavaScriptObject(object)) {
+    if (config == JsonMLConfig.skipDart || isNativeJavaScriptObject(object)) {
       return null;
     }
 
     var c = _simpleFormatter.preview(object);
     if (c == null) return null;
 
+    if (config == JsonMLConfig.keyToString) {
+      c = object.toString();
+    }
+
     // Indicate this is a Dart Object by using a Dart background color.
     // This is stylistically a bit ugly but it eases distinguishing Dart and
     // JS objects.
     var element = new JsonMLElement('span')
       ..setStyle('background-color: #d9edf7')
       ..createTextChild(c);
     return element.toJsonML();
   }
 
   bool hasBody(object) => _simpleFormatter.hasChildren(object);
@@ skipping 10 matching lines @@
       var li = body.createChild('li');
       var nameSpan = new JsonMLElement('span')
         ..createTextChild(child.name != null ? child.name + ': ' : '')
         ..setStyle('color: rgb(136, 19, 145);');
       if (_typeof(child.value) == 'object' ||
           _typeof(child.value) == 'function') {
         nameSpan.addStyle("padding-left: 13px;");
 
         li.appendChild(nameSpan);
         var objectTag = li.createObjectTag(child.value);
-        if (child.skipDart) {
-          objectTag.addAttribute('config', skipDartConfig);
-        }
+        objectTag.addAttribute('config', child.config);
         if (!_simpleFormatter.hasChildren(child.value)) {
           li.setStyle("padding-left: 13px;");
         }
       } else {
         li.setStyle("padding-left: 13px;");
         li.createChild('span')
           ..appendChild(nameSpan)
           ..createTextChild(safePreview(child.value));
       }
     }
@@ skipping 173 matching lines @@
 
   bool hasChildren(object) => true;
 
   String preview(object) {
     return dart.typeName(dart.getReifiedType(object));
   }
 
   List<NameValuePair> children(object) => <NameValuePair>[
         new NameValuePair(name: 'signature', value: preview(object)),
         new NameValuePair(
-            name: 'JavaScript Function', value: object, skipDart: true)
+            name: 'JavaScript Function',
+            value: object,
+            config: JsonMLConfig.skipDart)
       ];
 }
 
 /// Formatter for Dart Map objects.
 class MapFormatter extends ObjectFormatter {
   accept(object) => object is Map;
 
   bool hasChildren(object) => true;
 
   String preview(object) {
@@ skipping 85 matching lines @@
       ret.add(new NameValuePair(
           name: '[[Implements]]',
           value: new HeritageClause('implements', implements())));
     }
     var mixins = dart.getMixins(type);
     if (mixins != null && mixins.isNotEmpty) {
       ret.add(new NameValuePair(
           name: '[[Mixins]]', value: new HeritageClause('mixins', mixins)));
     }
     ret.add(new NameValuePair(
-        name: '[[JavaScript View]]', value: entry.object, skipDart: true));
+        name: '[[JavaScript View]]',
+        value: entry.object,
+        config: JsonMLConfig.skipDart));
 
     // TODO(jacobr): provide a link to the base class or perhaps the entire
     // base class hierarchy as a flat list.
 
     if (entry.object is! Type) {
       ret.add(new NameValuePair(
           name: '[[JavaScript Constructor]]',
           value: JSNative.getProperty(entry.object, 'constructor'),
-          skipDart: true));
+          config: JsonMLConfig.skipDart));
       // TODO(jacobr): add constructors, methods, extended class, and static
     }
     return ret;
   }
 }
 
 /// Formatter for synthetic MapEntry objects used to display contents of a Map
 /// cleanly.
 class MapEntryFormatter implements Formatter {
   accept(object) => object is MapEntry;
 
   String preview(object) {
     MapEntry entry = object;
     return '${safePreview(entry.key)} => ${safePreview(entry.value)}';
   }
 
   bool hasChildren(object) => true;
 
   List<NameValuePair> children(object) => <NameValuePair>[
-        new NameValuePair(name: 'key', value: object.key),
+        new NameValuePair(
+            name: 'key', value: object.key, config: JsonMLConfig.keyToString),
         new NameValuePair(name: 'value', value: object.value)
       ];
 }
 
 /// Formatter for Dart Iterable objects including List and Set.
 class HeritageClauseFormatter implements Formatter {
   bool accept(object) => object is HeritageClause;
 
   String preview(object) {
     HeritageClause clause = object;
@@ skipping 12 matching lines @@
     return ret;
   }
 }
 
 /// This entry point is automatically invoked by the code generated by
 /// Dart Dev Compiler
 registerDevtoolsFormatter() {
   var formatters = [_devtoolsFormatter];
   JS('', 'dart.global.devtoolsFormatters = #', formatters);
 }