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

pkg/analyzer/lib/dart/ast/ast_factory.dart

Index: pkg/analyzer/lib/dart/ast/ast_factory.dart
diff --git a/pkg/analyzer/lib/dart/ast/ast_factory.dart b/pkg/analyzer/lib/dart/ast/ast_factory.dart
index 48b918d8fb72d107b8c08dc39f1a9027df84b37c..ffaf90e18f73c9c9742fc30adff887332ceff1df 100644
--- a/pkg/analyzer/lib/dart/ast/ast_factory.dart
+++ b/pkg/analyzer/lib/dart/ast/ast_factory.dart
@@ -39,7 +39,7 @@ abstract class AstFactory {
    * Returns a newly created as expression.
    */
   AsExpression asExpression(
-      Expression expression, Token asOperator, TypeAnnotation type);
+      Expression expression, Token asOperator, TypeName type);
 
   /**
    * Returns a newly created assert initializer. The [comma] and [message]
@@ -128,7 +128,7 @@ abstract class AstFactory {
    */
   CatchClause catchClause(
       Token onKeyword,
-      TypeAnnotation exceptionType,
+      TypeName exceptionType,
       Token catchKeyword,
       Token leftParenthesis,
       SimpleIdentifier exceptionParameter,
@@ -290,7 +290,7 @@ abstract class AstFactory {
       Comment comment,
       List<Annotation> metadata,
       Token keyword,
-      TypeAnnotation type,
+      TypeName type,
       SimpleIdentifier identifier);
 
   /**
@@ -423,7 +423,7 @@ abstract class AstFactory {
       Comment comment,
       List<Annotation> metadata,
       Token keyword,
-      TypeAnnotation type,
+      TypeName type,
       Token thisKeyword,
       Token period,
       SimpleIdentifier identifier,
@@ -502,7 +502,7 @@ abstract class AstFactory {
       Comment comment,
       List<Annotation> metadata,
       Token externalKeyword,
-      TypeAnnotation returnType,
+      TypeName returnType,
       Token propertyKeyword,
       SimpleIdentifier name,
       FunctionExpression functionExpression);
@@ -536,7 +536,7 @@ abstract class AstFactory {
       Comment comment,
       List<Annotation> metadata,
       Token keyword,
-      TypeAnnotation returnType,
+      TypeName returnType,
       SimpleIdentifier name,
       TypeParameterList typeParameters,
       FormalParameterList parameters,
@@ -551,7 +551,7 @@ abstract class AstFactory {
   FunctionTypedFormalParameter functionTypedFormalParameter(
       Comment comment,
       List<Annotation> metadata,
-      TypeAnnotation returnType,
+      TypeName returnType,
       SimpleIdentifier identifier,
       TypeParameterList typeParameters,
       FormalParameterList parameters,
@@ -642,7 +642,7 @@ abstract class AstFactory {
    * if the sense of the test is not negated.
    */
   IsExpression isExpression(Expression expression, Token isOperator,
-      Token notOperator, TypeAnnotation type);
+      Token notOperator, TypeName type);
 
   /**
    * Returns a newly created label.
@@ -706,7 +706,7 @@ abstract class AstFactory {
       List<Annotation> metadata,
       Token externalKeyword,
       Token modifierKeyword,
-      TypeAnnotation returnType,
+      TypeName returnType,
       Token propertyKeyword,
       Token operatorKeyword,
       SimpleIdentifier name,
@@ -849,7 +849,7 @@ abstract class AstFactory {
       Comment comment,
       List<Annotation> metadata,
       Token keyword,
-      TypeAnnotation type,
+      TypeName type,
       SimpleIdentifier identifier);
 
   /**
@@ -948,7 +948,7 @@ abstract class AstFactory {
    * Returns a newly created list of type arguments.
    */
   TypeArgumentList typeArgumentList(
-      Token leftBracket, List<TypeAnnotation> arguments, Token rightBracket);
+      Token leftBracket, List<TypeName> arguments, Token rightBracket);
 
   /**
    * Returns a newly created type name. The [typeArguments] can be `null` if
@@ -964,7 +964,7 @@ abstract class AstFactory {
    * the parameter does not have an upper bound.
    */
   TypeParameter typeParameter(Comment comment, List<Annotation> metadata,
-      SimpleIdentifier name, Token extendsKeyword, TypeAnnotation bound);
+      SimpleIdentifier name, Token extendsKeyword, TypeName bound);
 
   /**
    * Returns a newly created list of type parameters.
@@ -989,23 +989,10 @@ abstract class AstFactory {
       Comment comment,
       List<Annotation> metadata,
       Token keyword,
-      TypeAnnotation type,
+      TypeName type,
       List<VariableDeclaration> variables);
 
   /**
-   * Returns a newly created generic type alias. Either or both of the
-   * [comment] and [metadata] can be `null` if the variable list does not have
-   * the corresponding attribute. The [typeParameters] can be `null` if there
-   * are no type parameters.
-   */
-  GenericTypeAlias genericTypeAlias(Comment comment, List<Annotation> metadata, Token typedefKeyword, SimpleIdentifier name, TypeParameterList typeParameters, Token equals, GenericFunctionType functionType, Token semicolon);
-
-  /**
-   * Initialize a newly created generic function type.
-   */
-  GenericFunctionType genericFunctionType(TypeAnnotation returnType, Token functionKeyword, TypeParameterList typeParameters, FormalParameterList _parameters);
-
-  /**
    * Returns a newly created variable declaration statement.
    */
   VariableDeclarationStatement variableDeclarationStatement(