Fix dumpInfo: include information for methods that are not in the generated

pkg/compiler/lib/src/dump_info.dart

 // Copyright (c) 2013, 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 dump_info;
 
 import 'dart:convert' show
     HtmlEscape,
     JsonEncoder,
     StringConversionSink,
@@ skipping 287 matching lines @@
 
     Map<String, dynamic> modifiers = {
       'static': element.isStatic,
       'const': element.isConst,
       'factory': element.isFactoryConstructor,
       'external': element.isPatched
     };
 
     var enclosingElement = element.enclosingElement;
     if (enclosingElement.isField ||
                enclosingElement.isFunction ||

[sra1, 2015/04/17 17:35:45]

fix this indentation while you are here. Tabs?

[Siggi Cherem (dart-lang), 2015/04/17 17:52:20]

Done.

                element.isClosure ||
                enclosingElement.isConstructor) {
       kind = "closure";
       name = "<unnamed>";
     } else if (modifiers['static']) {
       kind = 'function';
     } else if (enclosingElement.isClass) {
       kind = 'method';
     }
 
     if (element.isConstructor) {
       name == ""
         ? "${element.enclosingElement.name}"
         : "${element.enclosingElement.name}.${element.name}";
       kind = "constructor";
     }
 
-    if (emittedCode != null) {
+    if (element.hasFunctionSignature) {
       FunctionSignature signature = element.functionSignature;
-      returnType = signature.type.returnType.toString();
       signature.forEachParameter((parameter) {
         parameters.add({
           'name': parameter.name,
-          'type': compiler.typesTask
-            .getGuaranteedTypeOfElement(parameter).toString(),
-          'declaredType': parameter.node.type.toString()
+          'type': '${compiler.typesTask.getGuaranteedTypeOfElement(parameter)}',
+          'declaredType': '${parameter.node.type}'
         });
       });
-      inferredReturnType = compiler.typesTask
-        .getGuaranteedReturnTypeOfElement(element).toString();
-      sideEffects = compiler.world.getSideEffectsOfElement(element).toString();
-      code = emittedCode.toString();
     }
 
+    if (element.isInstanceMember && !element.isAbstract &&
+        compiler.world.allFunctions.contains(element)) {
+      returnType = '${element.type.returnType}';
+    }
+    inferredReturnType =
+        '${compiler.typesTask.getGuaranteedReturnTypeOfElement(element)}';
+    sideEffects = compiler.world.getSideEffectsOfElement(element).toString();
+
     if (element is MemberElement) {
       MemberElement member = element as MemberElement;
       for (Element closure in member.nestedClosures) {
         Map<String, dynamic> child = this.process(closure);
         if (child != null) {
           child['kind'] = 'closure';
           children.add(child['id']);
           size += child['size'];
         }
       }
@@ skipping 16 matching lines @@
       'name': name,
       'id': id,
       'modifiers': modifiers,
       'children': children,
       'size': size,
       'returnType': returnType,
       'inferredReturnType': inferredReturnType,
       'parameters': parameters,
       'sideEffects': sideEffects,
       'inlinedCount': inlinedCount,
-      'code': code,
+      'code': emittedCode == null ? null : '$emittedCode',
       'type': element.type.toString(),
       'outputUnit': mapper._outputUnit.add(outputUnit)
     };
   }
 }
 
 class Selection {
   final Element selectedElement;
   final Selector selector;
   Selection(this.selectedElement, this.selector);
@@ skipping 154 matching lines @@
       StringBuffer jsonBuffer = new StringBuffer();
       dumpInfoJson(jsonBuffer);
       compiler.outputProvider('', 'info.json')
         ..add(jsonBuffer.toString())
         ..close();
     });
   }
 
 
   void dumpInfoJson(StringSink buffer) {
-    JsonEncoder encoder = const JsonEncoder();
+    JsonEncoder encoder = const JsonEncoder.withIndent('  ');

[Siggi Cherem (dart-lang), 2015/04/17 15:52:55]

this is not needed, but makes the output easier to read by hand.

     DateTime startToJsonTime = new DateTime.now();
 
     Map<String, List<Map<String, String>>> holding =
         <String, List<Map<String, String>>>{};
     for (Element fn in infoCollector.mapper.functions) {
       Iterable<Selection> pulling = getRetaining(fn);
       // Don't bother recording an empty list of dependencies.
       if (pulling.length > 0) {
         String fnId = infoCollector.idOf(fn);
         // Some dart2js builtin functions are not
@@ skipping 73 matching lines @@
     ChunkedConversionSink<Object> sink =
       encoder.startChunkedConversion(
           new StringConversionSink.fromStringSink(buffer));
     sink.add(outJson);
     compiler.reportInfo(NO_LOCATION_SPANNABLE,
         const MessageKind(
             "View the dumped .info.json file at "
             "https://dart-lang.github.io/dump-info-visualizer"));
   }
 }