Revert "Add support for generic function type syntax, part 1" (TBR)

pkg/analyzer/lib/src/summary/resynthesize.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 summary_resynthesizer;
 
 import 'dart:collection';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
@@ skipping 459 matching lines @@
           break;
         // invokeMethodRef
         case UnlinkedExprOperation.invokeMethodRef:
           _pushInvokeMethodRef();
           break;
         // containers
         case UnlinkedExprOperation.makeUntypedList:
           _pushList(null);
           break;
         case UnlinkedExprOperation.makeTypedList:
-          TypeAnnotation itemType = _newTypeName();
-          _pushList(
-              AstTestFactory.typeArgumentList(<TypeAnnotation>[itemType]));
+          TypeName itemType = _newTypeName();
+          _pushList(AstTestFactory.typeArgumentList(<TypeName>[itemType]));
           break;
         case UnlinkedExprOperation.makeUntypedMap:
           _pushMap(null);
           break;
         case UnlinkedExprOperation.makeTypedMap:
-          TypeAnnotation keyType = _newTypeName();
-          TypeAnnotation valueType = _newTypeName();
-          _pushMap(AstTestFactory
-              .typeArgumentList(<TypeAnnotation>[keyType, valueType]));
+          TypeName keyType = _newTypeName();
+          TypeName valueType = _newTypeName();
+          _pushMap(
+              AstTestFactory.typeArgumentList(<TypeName>[keyType, valueType]));
           break;
         case UnlinkedExprOperation.pushReference:
           _pushReference();
           break;
         case UnlinkedExprOperation.extractProperty:
           _pushExtractProperty();
           break;
         case UnlinkedExprOperation.invokeConstructor:
           _pushInstanceCreation();
           break;
@@ skipping 71 matching lines @@
     if (enclosing is SimpleIdentifier) {
       SimpleIdentifier identifier = AstTestFactory.identifier3(info.name)
         ..staticElement = element;
       return AstTestFactory.identifier(enclosing, identifier);
     }
     SimpleIdentifier property = AstTestFactory.identifier3(info.name)
       ..staticElement = element;
     return AstTestFactory.propertyAccess(enclosing, property);
   }
 
-  TypeAnnotation _buildTypeAst(DartType type) {
-    List<TypeAnnotation> argumentNodes;
+  TypeName _buildTypeAst(DartType type) {
+    List<TypeName> argumentNodes;
     if (type is ParameterizedType) {
       if (!resynthesizer.libraryResynthesizer.typesWithImplicitTypeArguments
           .contains(type)) {
         List<DartType> typeArguments = type.typeArguments;
         argumentNodes = typeArguments.every((a) => a.isDynamic)
             ? null
             : typeArguments.map(_buildTypeAst).toList();
       }
     }
     TypeName node = AstTestFactory.typeName4(type.name, argumentNodes);
@@ skipping 13 matching lines @@
           TokenFactory.tokenFromType(TokenType.STRING_INTERPOLATION_EXPRESSION),
           expr,
           TokenFactory.tokenFromType(TokenType.CLOSE_CURLY_BRACKET));
     }
   }
 
   /**
    * Convert the next reference to the [DartType] and return the AST
    * corresponding to this type.
    */
-  TypeAnnotation _newTypeName() {
+  TypeName _newTypeName() {
     EntityRef typeRef = uc.references[refPtr++];
     DartType type =
         resynthesizer.buildType(typeRef, context?.typeParameterContext);
     return _buildTypeAst(type);
   }
 
   Expression _pop() => stack.removeLast();
 
   void _push(Expression expr) {
     stack.add(expr);
@@ skipping 89 matching lines @@
   }
 
   void _pushInvokeMethodRef() {
     List<Expression> arguments = _buildArguments();
     EntityRef ref = uc.references[refPtr++];
     _ReferenceInfo info = resynthesizer.getReferenceInfo(ref.reference);
     Expression node = _buildIdentifierSequence(info);
     TypeArgumentList typeArguments;
     int numTypeArguments = uc.ints[intPtr++];
     if (numTypeArguments > 0) {
-      List<TypeAnnotation> typeNames =
-          new List<TypeAnnotation>(numTypeArguments);
+      List<TypeName> typeNames = new List<TypeName>(numTypeArguments);
       for (int i = 0; i < numTypeArguments; i++) {
         typeNames[i] = _newTypeName();
       }
       typeArguments = AstTestFactory.typeArgumentList(typeNames);
     }
     if (node is SimpleIdentifier) {
       _push(astFactory.methodInvocation(
           null,
           TokenFactory.tokenFromType(TokenType.PERIOD),
           node,
@@ skipping 1174 matching lines @@
   static String _getElementIdentifier(String name, ReferenceKind kind) {
     if (kind == ReferenceKind.topLevelPropertyAccessor ||
         kind == ReferenceKind.propertyAccessor) {
       if (!name.endsWith('=')) {
         return name + '?';
       }
     }
     return name;
   }
 }