Resolve typedefs.

lib/dartdoc/mirrors/dart2js_mirror.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.
 
 #library('mirrors.dart2js');
 
 #import('../../compiler/compiler.dart', prefix: 'diagnostics');
 #import('../../compiler/implementation/elements/elements.dart');
 #import('../../compiler/implementation/apiimpl.dart', prefix: 'api');
 #import('../../compiler/implementation/scanner/scannerlib.dart');
@@ skipping 43 matching lines @@
     Type type,
     InterfaceType defaultType,
     [FunctionSignature functionSignature]) {
   if (type === null) {
     return new Dart2JsInterfaceTypeMirror(system, defaultType);
   } else if (type is InterfaceType) {
     return new Dart2JsInterfaceTypeMirror(system, type);
   } else if (type is TypeVariableType) {
     return new Dart2JsTypeVariableMirror(system, type);
   } else if (type is FunctionType) {
-    if (type.element is TypedefElement) {
-      return new Dart2JsTypedefMirror(system, type.element);
-    } else {
-      return new Dart2JsFunctionTypeMirror(system, type, functionSignature);
-    }
+    return new Dart2JsFunctionTypeMirror(system, type, functionSignature);
   } else if (type is VoidType) {
     return new Dart2JsVoidMirror(system, type);
+  } else if (type is TypedefType) {
+    return new Dart2JsTypedefMirror(system, type);
   }
   throw new IllegalArgumentException("Unexpected interface type $type");
 }
 
 Collection<Dart2JsMemberMirror> _convertElementMemberToMemberMirrors(
     Dart2JsObjectMirror library, Element element) {
   if (element is SynthesizedConstructorElement) {
     return const <Dart2JsMemberMirror>[];
   } else if (element is VariableElement) {
     return <Dart2JsMemberMirror>[new Dart2JsFieldMirror(library, element)];
@@ skipping 414 matching lines @@
 
   void _ensureTypes() {
     if (_types == null) {
       _types = <InterfaceMirror>{};
       _library.forEachExport((Element e) {
         if (e.getLibrary() == _library) {
           if (e.isClass()) {
             var type = new Dart2JsInterfaceMirror.fromLibrary(this, e);
             _types[type.canonicalName] = type;
           } else if (e.isTypedef()) {
-            var type = new Dart2JsTypedefMirror.fromLibrary(this, e);
+            var type = new Dart2JsTypedefMirror.fromLibrary(this,
+                e.computeType(system.compiler));
             _types[type.canonicalName] = type;
           }
         }
       });
     }
   }
 
   void _ensureMembers() {
     if (_members == null) {
       _members = <MemberMirror>{};
@@ skipping 230 matching lines @@
   bool get isDeclaration() => true;
 
   List<TypeMirror> typeArguments() {
     throw new UnsupportedOperationException(
         'Declarations do not have type arguments');
   }
 
   List<TypeVariableMirror> typeVariables() {
     if (_typeVariables == null) {
       _typeVariables = <TypeVariableMirror>[];
-      _class.typeParameters.forEach((_,parameter) {
+      for (TypeVariableType typeVariable in _class.typeVariables) {
         _typeVariables.add(
-            new Dart2JsTypeVariableMirror(system,
-                parameter.computeType(system.compiler)));
-      });
+            new Dart2JsTypeVariableMirror(system, typeVariable));
+      }
     }
     return _typeVariables;
   }
 
   Map<Object, MethodMirror> constructors() {
     _ensureMembers();
     return new AsFilteredImmutableMap<Object, MemberMirror, MethodMirror>(
         _members, (m) => m.isConstructor ? m : null);
   }
 
@@ skipping 17 matching lines @@
     if (library() != other.library()) {
       return false;
     }
     if (isDeclaration !== other.isDeclaration) {
       return false;
     }
     return qualifiedName() == other.qualifiedName();
   }
 }
 
-class Dart2JsTypedefMirror extends Dart2JsElementMirror
+class Dart2JsTypedefMirror extends Dart2JsTypeElementMirror
     implements Dart2JsTypeMirror, TypedefMirror {
   final Dart2JsLibraryMirror _library;
   List<TypeVariableMirror> _typeVariables;
   TypeMirror _definition;
 
-  Dart2JsTypedefMirror(Dart2JsMirrorSystem system, TypedefElement _typedef)
-      : this._library = system.getLibrary(_typedef.getLibrary()),
+  Dart2JsTypedefMirror(Dart2JsMirrorSystem system, TypedefType _typedef)
+      : this._library = system.getLibrary(_typedef.element.getLibrary()),
         super(system, _typedef);
 
   Dart2JsTypedefMirror.fromLibrary(Dart2JsLibraryMirror library,
-                                   TypedefElement _typedef)
+                                   TypedefType _typedef)
       : this._library = library,
         super(library.system, _typedef);
 
-  TypedefElement get _typedef() => _element;
+  TypedefType get _typedef() => _type;
 
   String get canonicalName() => simpleName();
 
   String qualifiedName() => '${library().qualifiedName()}.${simpleName()}';
 
   Location location() {
-    var node = _typedef.parseNode(_diagnosticListener);
+    var node = _typedef.element.parseNode(_diagnosticListener);
     if (node !== null) {
-      var script = _typedef.getCompilationUnit().script;
+      var script = _typedef.element.getCompilationUnit().script;
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     }
     return super.location();
   }
 
   LibraryMirror library() => _library;
 
   bool get isObject() => false;
 
@@ skipping 66 matching lines @@
 
   String qualifiedName() => '${declarer().qualifiedName()}.${simpleName()}';
 
   InterfaceMirror declarer() {
     if (_declarer === null) {
       if (_typeVariableType.element.enclosingElement.isClass()) {
         _declarer = new Dart2JsInterfaceMirror(system,
             _typeVariableType.element.enclosingElement);
       } else if (_typeVariableType.element.enclosingElement.isTypedef()) {
         _declarer = new Dart2JsTypedefMirror(system,
-            _typeVariableType.element.enclosingElement);
+            _typeVariableType.element.enclosingElement.computeType(
+                system.compiler));
       }
     }
     return _declarer;
   }
 
   LibraryMirror library() => declarer().library();
 
   bool get isObject() => false;
 
   bool get isDynamic() => false;
@@ skipping 94 matching lines @@
 
   bool get isInterface() => declaration.isInterface;
 
   bool get isPrivate() => declaration.isPrivate;
 
   bool get isDeclaration() => false;
 
   List<TypeMirror> typeArguments() {
     if (_typeArguments == null) {
       _typeArguments = <TypeMirror>[];
-      Link<Type> type = _interfaceType.arguments;
+      Link<Type> type = _interfaceType.typeArguments;
       while (type != null && type.head != null) {
         _typeArguments.add(_convertTypeToTypeMirror(system, type.head,
             system.compiler.dynamicClass.computeType(system.compiler)));
         type = type.tail;
       }
     }
     return _typeArguments;
   }
 
   List<TypeVariableMirror> typeVariables() => declaration.typeVariables();
@@ skipping 327 matching lines @@
     if (node !== null) {
       var span = system.compiler.spanFromNode(node, script.uri);
       return new Dart2JsLocation(script, span);
     } else {
       var span = system.compiler.spanFromElement(_variable);
       return new Dart2JsLocation(script, span);
     }
   }
 }