Properly rename type variables.

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 340 matching lines @@
 
   static bool isDynamicType(TypeAnnotation typeAnnotation) {
     if (!isPlainTypeName(typeAnnotation)) return false;
     String name = typeAnnotation.typeName.asIdentifier().source.slowToString();
     return name == 'Dynamic';
   }
 
   visitTypeAnnotation(TypeAnnotation node) {
     // Poor man generic variables resolution.
     // TODO(antonm): get rid of it once resolver can deal with it.
-    if (isPlainTypeName(node) && currentElement is TypeDeclarationElement) {
+    TypeDeclarationElement typeDeclarationElement;
+    if (currentElement is TypeDeclarationElement) {
+      typeDeclarationElement = currentElement;
+    } else {
+      typeDeclarationElement = currentElement.getEnclosingClass();
+    }
+    if (typeDeclarationElement !== null && isPlainTypeName(node)) {
       SourceString name = node.typeName.asIdentifier().source;
-      TypeDeclarationElement typeElement = currentElement;
-      for (TypeVariableType parameter in typeElement.typeVariables) {
+      for (TypeVariableType parameter in typeDeclarationElement.typeVariables) {
         if (parameter.name == name) {
-          // type annotation matches one of parameters, shouldn't be renamed.
+          makeTypePlaceholder(node, parameter);
           return;
         }
       }
     }
     final type = compiler.resolveTypeAnnotation(currentElement, node);
     if (type is InterfaceType || type is TypedefType) {
       var target = node.typeName;
       if (node.typeName is Send) {
         final element = treeElements[node];
         if (element !== null) {
@@ skipping 57 matching lines @@
           tryMakeLocalPlaceholder(element, node.name);
         }
       }
     }
     node.visitChildren(this);
   }
 
   visitClassNode(ClassNode node) {
     assert(currentElement is ClassElement);
     makeElementPlaceholder(node.name, currentElement);
     node.visitChildren(this);

[Roman, 2012/08/22 08:32:07]

probably my last change in ClassNode affects this.

+    if (node.typeParameters !== null) {
+      // Another poor man resolution.
+      final typeVariableTypes =
+          new List<Type>.from(currentElement.typeVariables);
+      int i = 0;
+      for (TypeVariable typeVariable in node.typeParameters) {
+        makeTypePlaceholder(typeVariable.name, typeVariableTypes[i]);
+        i++;
+      }
+    }
     if (node.defaultClause !== null) {
       // Can't just visit class node's default clause because of the bug in the
       // resolver, it just crashes when it meets type variable.
       Type defaultType = (currentElement as ClassElement).defaultClass;
       assert(defaultType !== null);
       makeTypePlaceholder(node.defaultClause.typeName, defaultType);
       visit(node.defaultClause.typeArguments);
     }
   }
 
   visitTypedef(Typedef node) {
     assert(currentElement is TypedefElement);
     makeElementPlaceholder(node.name, currentElement);
     node.visitChildren(this);
   }
 }