Use better names for closures and static variables.

lib/compiler/implementation/namer.dart

 // Copyright (c) 2011, 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.
 
 /**
  * Assigns JavaScript identifiers to Dart variables, class-names and members.
  */
 class Namer {
   final Compiler compiler;
 
@@ skipping 24 matching lines @@
   final String STATIC_CLOSURE_NAME_NAME = @'$name';
   final SourceString CLOSURE_INVOCATION_NAME = const SourceString(@'$call');
 
 
   String closureInvocationName(Selector selector) {
     // TODO(floitsch): mangle, while not conflicting with instance names.
     return instanceMethodInvocationName(null, CLOSURE_INVOCATION_NAME,
                                         selector);
   }
 
+  /** Returns a non-unique name for the given closure element. */
+  String closureName(Element element) {
+    List<String> parts = <String>[];
+    SourceString ownName = element.name;
+    if (ownName == null || ownName.stringValue == "") {
+      parts.add("anon");
+    } else {
+      parts.add(ownName.slowToString());
+    }
+    for (Element enclosingElement = element.enclosingElement;
+         enclosingElement != null &&
+             (enclosingElement.kind === ElementKind.GENERATIVE_CONSTRUCTOR_BODY
+              || enclosingElement.kind === ElementKind.CLASS
+              || enclosingElement.kind === ElementKind.FUNCTION
+              || enclosingElement.kind === ElementKind.GETTER
+              || enclosingElement.kind === ElementKind.SETTER);
+         enclosingElement = enclosingElement.enclosingElement) {
+      SourceString surroundingName = enclosingElement.name;
+      if (surroundingName != null) {
+        String surroundingNameString = surroundingName.slowToString();
+        if (surroundingNameString != "") parts.add(surroundingNameString);
+      }
+    }
+    // Invert the parts.
+    for (int i = 0, j = parts.length - 1; i < j; i++, j--) {
+      var tmp = parts[i];
+      parts[i] = parts[j];
+      parts[j] = tmp;
+    }
+    return safeName(Strings.join(parts, "_"));
+  }
+
   String privateName(LibraryElement lib, SourceString name) {
     if (name.isPrivate()) {
       String nameString = name.slowToString();
 
       // The first library asking for a short private name wins.
       LibraryElement owner =
           shortPrivateNameOwners.putIfAbsent(nameString, () => lib);
       // If a private name could clash with a mangled private name we don't
       // use the short name. For example a private name "_lib3_foo" would
       // clash with "_foo" from "lib3".
@@ skipping 69 matching lines @@
 
   static final String LIBRARY_PREFIX = "lib";
 
   /**
    * Returns a preferred JS-id for the given top-level or static element.
    * The returned id is guaranteed to be a valid JS-id.
    */
   String _computeGuess(Element element) {
     assert(!element.isInstanceMember());
     LibraryElement lib = element.getLibrary();
-    if (element.kind == ElementKind.GENERATIVE_CONSTRUCTOR) {
-      FunctionElement functionElement = element;
-      return instanceMethodName(lib, element.name,
-                                functionElement.parameterCount(compiler));
-    } else {
-      // TODO(floitsch): deal with named constructors.
-      String name;
-      if (Elements.isStaticOrTopLevel(element)) {
-        name = element.name.slowToString();
-      } else if (element.kind == ElementKind.GETTER) {
-        name = getterName(lib, element.name);
-      } else if (element.kind == ElementKind.SETTER) {
-        name = setterName(lib, element.name);
-      } else if (element.kind == ElementKind.FUNCTION) {
-        FunctionElement functionElement = element;
-        name = element.name.slowToString();
-        name = '$name\$${functionElement.parameterCount(compiler)}';
-      } else if (element.kind === ElementKind.LIBRARY) {
-        name = LIBRARY_PREFIX;
+    String name;
+    if (element.isGenerativeConstructor()) {
+      if (element.name == element.enclosingElement.name) {
+        // Keep the class name for the class and not the factory.
+        name = "${element.name.slowToString()}\$";
       } else {
         name = element.name.slowToString();
       }
-      // Prefix the name with '$' if it is reserved.
-      return safeName(name);
+    } else if (Elements.isStaticOrTopLevel(element)) {
+      if (element.enclosingElement != null &&
+          element.enclosingElement.isClass()) {
+        name = "${element.enclosingElement.name.slowToString()}_"
+               "${element.name.slowToString()}";
+      } else {
+        name = element.name.slowToString();
+      }
+    } else if (element.kind === ElementKind.LIBRARY) {
+      name = LIBRARY_PREFIX;
+    } else {
+      name = element.name.slowToString();
     }
+    // Prefix the name with '$' if it is reserved.
+    return safeName(name);
   }
 
   String getBailoutName(Element element) {
     return '${getName(element)}\$bailout';
   }
 
   /**
    * Returns a preferred JS-id for the given element. The returned id is
    * guaranteed to be a valid JS-id. Globals and static fields are furthermore
    * guaranteed to be unique.
@@ skipping 70 matching lines @@
   }
 
   String safeName(String name) {
     if (jsReserved.contains(name) || name.startsWith('\$')) {
       name = "\$$name";
       assert(!jsReserved.contains(name));
     }
     return name;
   }
 }