Fix for parsing generic function types with Fasta.

[email protected]
BUG=

Review-Url: https://codereview.chromium.org/2732213003 .

Author: scheglov

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

@@ -626,7 +626,7 @@ abstract class AstFactory {
       TypeAnnotation returnType,
       Token functionKeyword,
       TypeParameterList typeParameters,
-      FormalParameterList _parameters);
+      FormalParameterList parameters);
 
   /**
    * Returns a newly created generic type alias. Either or both of the

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

@@ -548,9 +548,9 @@ class AstFactoryImpl extends AstFactory {
           TypeAnnotation returnType,
           Token functionKeyword,
           TypeParameterList typeParameters,
-          FormalParameterList _parameters) =>
+          FormalParameterList parameters) =>
       new GenericFunctionTypeImpl(
-          returnType, functionKeyword, typeParameters, _parameters);
+          returnType, functionKeyword, typeParameters, parameters);
 
   @override
   GenericTypeAlias genericTypeAlias(

pkg/analyzer/test/generated/parser_fasta_test.dart

@@ -106,13 +106,6 @@ class ClassMemberParserTest_Fasta extends FastaParserTestCase
     super.test_parseClassMember_method_returnType_functionType();
   }
 
-  @override
-  @failingTest
-  void test_parseClassMember_operator_functionType() {
-    // TODO(paulberry): InputError: ErrorKind.ExpectedFunctionBody {actual: operator}
-    super.test_parseClassMember_operator_functionType();
-  }
-
   @override
   @failingTest
   void test_parseClassMember_redirectingFactory_const() {
@@ -1339,78 +1332,4 @@ class TopLevelParserTest_Fasta extends FastaParserTestCase
     // Fasta.
     super.test_parsePartOfDirective_uri();
   }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_noParameters() {
-    super.test_parseTypeAlias_genericFunction_noParameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_noReturnType() {
-    super.test_parseTypeAlias_genericFunction_noReturnType();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_parameterizedReturnType() {
-    super.test_parseTypeAlias_genericFunction_parameterizedReturnType();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_parameters() {
-    super.test_parseTypeAlias_genericFunction_parameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_typeParameters() {
-    super.test_parseTypeAlias_genericFunction_typeParameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_typeParameters_noParameters() {
-    super.test_parseTypeAlias_genericFunction_typeParameters_noParameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_typeParameters_noReturnType() {
-    super.test_parseTypeAlias_genericFunction_typeParameters_noReturnType();
-  }
-
-  @override
-  @failingTest
-  void
-      test_parseTypeAlias_genericFunction_typeParameters_parameterizedReturnType() {
-    super
-        .test_parseTypeAlias_genericFunction_typeParameters_parameterizedReturnType();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_typeParameters_parameters() {
-    super.test_parseTypeAlias_genericFunction_typeParameters_parameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_typeParameters_typeParameters() {
-    super.test_parseTypeAlias_genericFunction_typeParameters_typeParameters();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_typeParameters_voidReturnType() {
-    super.test_parseTypeAlias_genericFunction_typeParameters_voidReturnType();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeAlias_genericFunction_voidReturnType() {
-    super.test_parseTypeAlias_genericFunction_voidReturnType();
-  }
 }

pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart

@@ -598,6 +598,15 @@ class AstBuilder extends ScopeListener {
     push(new _ParameterDefaultValue(equals, value));
   }
 
+  void handleFunctionType(Token functionToken, Token semicolon) {
+    debugEvent("FunctionType");
+    FormalParameterList parameters = pop();
+    TypeParameterList typeParameters = pop();
+    TypeAnnotation returnType = pop();
+    push(ast.genericFunctionType(returnType, toAnalyzerToken(functionToken),
+        typeParameters, parameters));
+  }
+
   void handleFormalParameterWithoutValue(Token token) {
     debugEvent("FormalParameterWithoutValue");
     push(NullValue.ParameterDefaultValue);

pkg/front_end/lib/src/fasta/parser/listener.dart

@@ -680,6 +680,12 @@ class Listener {
     logEvent("NoName");
   }
 
+  /// Handle the end of a generic function type declaration.
+  ///
+  /// Substructures:
+  /// - Return type
+  /// - Type variables
+  /// - Formal parameters
   void handleFunctionType(Token functionToken, Token endToken) {
     logEvent("FunctionType");
   }