Simpler generic variables resolution.

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 309 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)) {
-      NodeList typeParameters = null;
-      if (currentElement is TypedefElement) {
-        Typedef typedefNode = currentElement.parseNode(compiler);
-        typeParameters = typedefNode.typeParameters;
-      }
-      if (currentElement is ClassElement) {
-        ClassNode classNode = currentElement.parseNode(compiler);
-        typeParameters = classNode.typeParameters;
-      }
-      if (typeParameters !== null) {
-        SourceString name = node.typeName.asIdentifier().source;
-        for (TypeVariable parameter in typeParameters) {
-          if (parameter.name.source == name) {
-            // type annotation matches one of parameters, shouldn't be renamed.
-            return;
-          }
+    if (isPlainTypeName(node) && currentElement is TypeDeclarationElement) {
+      SourceString name = node.typeName.asIdentifier().source;
+      TypeDeclarationElement typeElement = currentElement;
+      for (TypeVariableType parameter in typeElement.typeVariables) {
+        if (parameter.name == name) {
+          // type annotation matches one of parameters, shouldn't be renamed.
+          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) {
           final send = node.typeName.asSend();
@@ skipping 65 matching lines @@
     makeElementPlaceholder(node.name, currentElement);
     node.visitChildren(this);
   }
 
   visitTypedef(Typedef node) {
     assert(currentElement is TypedefElement);
     makeElementPlaceholder(node.name, currentElement);
     node.visitChildren(this);
   }
 }