Properly rename typedefs.

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 313 matching lines @@
       if (currentElement is ClassElement) {
         ClassElement classElement = currentElement;
         String typeName = node.typeName.asIdentifier().source.slowToString();
         for (TypeVariableType argument in classElement.type.arguments) {
           // If names are equal, then it's a variable and sholdn't be renamed.
           if (argument.name.slowToString() == typeName) return;
         }
       }
     }
     final type = compiler.resolveTypeAnnotation(currentElement, node);
-    if (type is !InterfaceType) return null;
-    var target = node.typeName;
-    if (node.typeName is Send) {
-      final element = treeElements[node];
-      if (element !== null) {
-        final send = node.typeName.asSend();
-        Identifier receiver = send.receiver;
-        Identifier selector = send.selector;
-        final hasPrefix = element.lookupConstructor(
-            receiver.source, selector.source) === null;
-        if (!hasPrefix) target = send.receiver;
+    if (type is InterfaceType || type is FunctionType) {
+      var target = node.typeName;
+      if (node.typeName is Send) {
+        final element = treeElements[node];
+        if (element !== null) {
+          final send = node.typeName.asSend();
+          Identifier receiver = send.receiver;
+          Identifier selector = send.selector;
+          final hasPrefix = element is TypedefElement ||
+              element.lookupConstructor(receiver.source, selector.source)
+                  === null;
+          if (!hasPrefix) target = send.receiver;
+        }
       }
-    }
-    // TODO(antonm): is there a better way to detect unresolved types?
-    if (type !== compiler.types.dynamicType) {
-      makeTypePlaceholder(target, type);
-    } else {
-      if (!isDynamicType(node)) makeUnresolvedPlaceholder(target);
+      // TODO(antonm): is there a better way to detect unresolved types?
+      if (type !== compiler.types.dynamicType) {
+        makeTypePlaceholder(target, type);
+      } else {
+        if (!isDynamicType(node)) makeUnresolvedPlaceholder(target);
+      }
     }
     node.visitChildren(this);
   }
 
   visitVariableDefinitions(VariableDefinitions node) {
     // Collect only local placeholders.
     if (currentElement is FunctionElement) {
       for (Node definition in node.definitions.nodes) {
         Element definitionElement = treeElements[definition];
         // definitionElement may be null if we're inside variable definitions
@@ skipping 34 matching lines @@
       }
     }
     node.visitChildren(this);
   }
 
   visitClassNode(ClassNode node) {
     assert(currentElement is ClassElement);
     makeElementPlaceholder(node.name, currentElement);
     node.visitChildren(this);
   }
+
+  visitTypedef(Typedef node) {
+    assert(currentElement is TypedefElement);
+    makeElementPlaceholder(node.name, currentElement);
+    node.visitChildren(this);
+  }
 }