dart2dart Fix factory for interfaces renames

lib/compiler/implementation/dart_backend/placeholder_collector.dart

 // Copyright (c) 2012, 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.
 
 class LocalPlaceholder implements Hashable {
   final String identifier;
   final Set<Node> nodes;
   LocalPlaceholder(this.identifier) : nodes = new Set<Node>();
   int hashCode() => identifier.hashCode();
   String toString() =>
@@ skipping 87 matching lines @@
   Element currentElement;
   TreeElements treeElements;
 
   PlaceholderCollector(this.compiler) :
       nullNodes = new Set<Node>(),
       unresolvedNodes = new Set<Identifier>(),
       elementNodes = new Map<Element, Set<Node>>(),
       localPlaceholders = new Map<FunctionElement, Set<LocalPlaceholder>>(),
       privateNodes = new Map<LibraryElement, Set<Identifier>>();
 
+  void tryMakeConstructorNamePlaceholder(
+      FunctionExpression constructor, ClassElement element) {
+    Node nameNode = constructor.name;
+    if (nameNode is Send) nameNode = nameNode.receiver;
+    if (nameNode.asIdentifier().token.slowToString()
+        == element.name.slowToString()) {
+      makeElementPlaceholder(nameNode, element);
+    }
+  }
+
   void collectFunctionDeclarationPlaceholders(
       FunctionElement element, FunctionExpression node) {
     if (element.isGenerativeConstructor() || element.isFactoryConstructor()) {
       // Two complicated cases for class/interface renaming:
       // 1) class which implements constructors of other interfaces, but not
       //    implements interfaces themselves:
       //      0.dart: class C { I(); }
       //      1.dart and 2.dart: interface I default C { I(); }
       //    now we have to duplicate our I() constructor in C class with
       //    proper names.
       // 2) (even worse for us):
       //      0.dart: class C { C(); }
       //      1.dart: interface C default p0.C { C(); }
       //    the second case is just a bug now.
-      final enclosingClass = element.getEnclosingClass();
-      Node nameNode = node.name;
-      if (nameNode is Send) nameNode = nameNode.receiver;
-      // For cases like class C implements I { I(); }
-      if (nameNode.asIdentifier().token.slowToString()
-          == enclosingClass.name.slowToString()) {
-        makeTypePlaceholder(nameNode, enclosingClass.type);
+      tryMakeConstructorNamePlaceholder(node, element.getEnclosingClass());
+
+      // If we have interface constructor, make sure that we put placeholder
+      // for its default factory implementation.
+      // Example:
+      // interface I default C { I();}
+      // class C { factory I() {} }
+      // 2 cases:
+      // Plain interface name. Rename it unless it is the default
+      // constructor for enclosing class.
+      // Example:
+      // interface I { I(); }
+      // class C implements I { C(); }  don't rename this case.
+      // OR I.named() inside C, rename first part.
+      if (element.defaultImplementation !== null
+          && element.defaultImplementation !== element) {
+        FunctionElement implementingFactory = element.defaultImplementation;
+        tryMakeConstructorNamePlaceholder(implementingFactory.cachedNode,
+            element.getEnclosingClass());
       }
+
       // Process Ctor(this._field) correctly.
       for (Node parameter in node.parameters) {
         VariableDefinitions definitions = parameter.asVariableDefinitions();
         if (definitions !== null) {
           for (Node definition in definitions.definitions) {
             Send send = definition.asSend();
             if (send !== null) {
               assert(send.receiver is Identifier);
               assert(send.receiver.asIdentifier().isThis());
               if (send.selector is Identifier) {
@@ skipping 283 matching lines @@
       visit(node.defaultClause.typeArguments);
     }
   }
 
   visitTypedef(Typedef node) {
     assert(currentElement is TypedefElement);
     makeElementPlaceholder(node.name, currentElement);
     node.visitChildren(this);
   }
 }