Fix for serializing annotations.

pkg/analyzer/lib/src/summary/summarize_elements.dart

 // Copyright (c) 2015, 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 serialization.elements;
 
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ skipping 1313 matching lines @@
   void serializeAnnotation(Annotation annotation) {
     if (annotation.arguments == null) {
       assert(annotation.constructorName == null);
       serialize(annotation.name);
     } else {
       Identifier name = annotation.name;
       Element nameElement = name.staticElement;
       EntityRefBuilder constructor;
       if (nameElement is ConstructorElement && name is PrefixedIdentifier) {
         assert(annotation.constructorName == null);
-        constructor = serializeConstructorName(
-            new TypeName(name.prefix, null)..type = nameElement.returnType,
-            name.identifier);
+        constructor = serializeConstructorRef(
+            nameElement.returnType, name.prefix, null, name.identifier);
       } else if (nameElement is TypeDefiningElement) {
-        constructor = serializeConstructorName(
-            new TypeName(annotation.name, null)..type = nameElement.type,
-            annotation.constructorName);
+        constructor = serializeConstructorRef(nameElement.type, annotation.name,
+            null, annotation.constructorName);
       } else if (nameElement == null) {
         // Unresolved annotation.
         if (name is PrefixedIdentifier && annotation.constructorName == null) {
-          constructor = serializeConstructorName(
-              new TypeName(name.prefix, null), name.identifier);
+          constructor =
+              serializeConstructorRef(null, name.prefix, null, name.identifier);
         } else {
-          constructor = serializeConstructorName(
-              new TypeName(annotation.name, null), annotation.constructorName);
+          constructor = serializeConstructorRef(
+              null, annotation.name, null, annotation.constructorName);
         }
       } else {
         throw new StateError('Unexpected annotation nameElement type:'
             ' ${nameElement.runtimeType}');
       }
       serializeInstanceCreation(constructor, annotation.arguments);
     }
   }
 
   @override
-  EntityRefBuilder serializeConstructorName(
-      TypeName type, SimpleIdentifier name) {
-    EntityRefBuilder typeRef = serializeType(type);
+  EntityRefBuilder serializeConstructorRef(DartType type, Identifier typeName,
+      TypeArgumentList typeArguments, SimpleIdentifier name) {
+    EntityRefBuilder typeRef = serializeType(type, typeName, typeArguments);
     if (name == null) {
       return typeRef;
     } else {
       LinkedReference typeLinkedRef =
           serializer.linkedReferences[typeRef.reference];
       int refId = serializer.serializeUnlinkedReference(
           name.name,
           name.staticElement != null
               ? ReferenceKind.constructor
               : ReferenceKind.unresolved,
@@ skipping 54 matching lines @@
             expr.propertyName.name, ReferenceKind.unresolved,
             prefixReference: targetRef);
         return new EntityRefBuilder(reference: ref);
       }
     } else {
       throw new StateError('Unexpected node type: ${expr.runtimeType}');
     }
   }
 
   @override
-  EntityRefBuilder serializeType(TypeName typeName) {
-    if (typeName != null) {
-      DartType type = typeName.type;
+  EntityRefBuilder serializeType(
+      DartType type, Identifier name, TypeArgumentList arguments) {
+    if (name != null) {
       if (type == null || type.isUndefined) {
-        return serializeIdentifier(typeName.name);
+        return serializeIdentifier(name);
       }
     }
-    DartType type = typeName != null ? typeName.type : DynamicTypeImpl.instance;
-    return serializer.serializeTypeRef(type, context);
+    DartType typeOrDynamic = type ?? DynamicTypeImpl.instance;
+    return serializer.serializeTypeRef(typeOrDynamic, context);
   }
 
   /**
    * Return `true` if the given [element] can be resolved at prelink step.
    */
   static bool _isPrelinkResolvableElement(Element element) {
     if (element == null) {
       return false;
     }
     if (element == DynamicTypeImpl.instance.element) {
@@ skipping 213 matching lines @@
       exportNames.add(new LinkedExportNameBuilder(
           name: name,
           dependency: serializeDependency(dependentLibrary),
           unit: unit,
           kind: kind));
     }
     pb.exportNames = exportNames;
     return pb;
   }
 }