Add support for parsing comments with generic parameters /*<K, V>*/ with Fasta.

pkg/analyzer/test/generated/parser_fasta_test.dart

 // Copyright (c) 2017, 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.
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart' as analyzer;
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/src/fasta/ast_builder.dart';
 import 'package:analyzer/src/fasta/element_store.dart';
@@ skipping 44 matching lines @@
     with ClassMemberParserTestMixin {
   @override
   @failingTest
   void test_parseClassMember_constructor_withInitializers() {
     // TODO(paulberry): 'this' can't be used here.
     super.test_parseClassMember_constructor_withInitializers();
   }
 
   @override
   @failingTest
-  void test_parseClassMember_method_generic_comment_noReturnType() {
-    // TODO(paulberry): Fasta doesn't support generic comment syntax
-    super.test_parseClassMember_method_generic_comment_noReturnType();
-  }
-
-  @override
-  @failingTest
   void test_parseClassMember_method_generic_comment_returnType() {
     // TODO(paulberry): Fasta doesn't support generic comment syntax
     super.test_parseClassMember_method_generic_comment_returnType();
   }
 
   @override
   @failingTest
   void test_parseClassMember_method_generic_comment_returnType_bound() {
     // TODO(paulberry): Fasta doesn't support generic comment syntax
     super.test_parseClassMember_method_generic_comment_returnType_bound();
   }
 
   @override
   @failingTest
-  void test_parseClassMember_method_generic_comment_void() {
-    // TODO(paulberry): Fasta doesn't support generic comment syntax
-    super.test_parseClassMember_method_generic_comment_void();
-  }
-
-  @override
-  @failingTest
   void test_parseConstructor_assert() {
     // TODO(paulberry): Fasta doesn't support asserts in initializers
     super.test_parseConstructor_assert();
   }
 }
 
 /**
  * Tests of the fasta parser based on [ComplexParserTestMixin].
  */
 @reflectiveTest
@@ skipping 102 matching lines @@
   }
 
   @override
   @failingTest
   void test_parseAssignableExpression_expression_args_dot_typeArguments() {
     super.test_parseAssignableExpression_expression_args_dot_typeArguments();
   }
 
   @override
   @failingTest
-  void
-      test_parseAssignableExpression_identifier_args_dot_typeArgumentComments() {
-    super
-        .test_parseAssignableExpression_identifier_args_dot_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
   void test_parseCascadeSection_ia_typeArgumentComments() {
     super.test_parseCascadeSection_ia_typeArgumentComments();
   }
 
   @override
   @failingTest
   void test_parseCascadeSection_ia_typeArguments() {
     super.test_parseCascadeSection_ia_typeArguments();
   }
 
   @override
   @failingTest
-  void test_parseCascadeSection_ii_typeArgumentComments() {
-    super.test_parseCascadeSection_ii_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
-  void test_parseCascadeSection_p_assign_withCascade_typeArgumentComments() {
-    super.test_parseCascadeSection_p_assign_withCascade_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
-  void test_parseCascadeSection_pa_typeArgumentComments() {
-    super.test_parseCascadeSection_pa_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
   void test_parseCascadeSection_paa_typeArgumentComments() {
     super.test_parseCascadeSection_paa_typeArgumentComments();
   }
 
   @override
   @failingTest
   void test_parseCascadeSection_paa_typeArguments() {
     super.test_parseCascadeSection_paa_typeArguments();
   }
 
   @override
   @failingTest
   void test_parseCascadeSection_paapaa_typeArgumentComments() {
     super.test_parseCascadeSection_paapaa_typeArgumentComments();
   }
 
   @override
   @failingTest
   void test_parseCascadeSection_paapaa_typeArguments() {
     super.test_parseCascadeSection_paapaa_typeArguments();
   }
 
   @override
   @failingTest
-  void test_parseCascadeSection_pap_typeArgumentComments() {
-    super.test_parseCascadeSection_pap_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
-  void test_parseConstExpression_listLiteral_typed_genericComment() {
-    super.test_parseConstExpression_listLiteral_typed_genericComment();
-  }
-
-  @override
-  @failingTest
-  void test_parseConstExpression_mapLiteral_typed_genericComment() {
-    super.test_parseConstExpression_mapLiteral_typed_genericComment();
-  }
-
-  @override
-  @failingTest
   void test_parseExpression_assign_compound() {
     super.test_parseExpression_assign_compound();
   }
 
   @override
   @failingTest
-  void test_parseExpression_superMethodInvocation_typeArgumentComments() {
-    super.test_parseExpression_superMethodInvocation_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
-  void
-      test_parseExpressionWithoutCascade_superMethodInvocation_typeArgumentComments() {
-    super
-        .test_parseExpressionWithoutCascade_superMethodInvocation_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
   void test_parseFunctionExpression_typeParameterComments() {
     super.test_parseFunctionExpression_typeParameterComments();
   }
 
   @override
   @failingTest
-  void
-      test_parseInstanceCreationExpression_qualifiedType_named_typeArgumentComments() {
-    super
-        .test_parseInstanceCreationExpression_qualifiedType_named_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
-  void
-      test_parseInstanceCreationExpression_qualifiedType_typeArgumentComments() {
-    super
-        .test_parseInstanceCreationExpression_qualifiedType_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
   void test_parseInstanceCreationExpression_type_named_typeArgumentComments() {
     super
         .test_parseInstanceCreationExpression_type_named_typeArgumentComments();
   }
 
   @override
   @failingTest
-  void test_parseInstanceCreationExpression_type_typeArgumentComments() {
-    super.test_parseInstanceCreationExpression_type_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
   void test_parseInstanceCreationExpression_type_typeArguments_nullable() {
     super.test_parseInstanceCreationExpression_type_typeArguments_nullable();
   }
 
   @override
   @failingTest
   void test_parseListLiteral_empty_oneToken_withComment() {
     super.test_parseListLiteral_empty_oneToken_withComment();
   }
 
   @override
   @failingTest
-  void
-      test_parsePostfixExpression_none_methodInvocation_question_dot_typeArgumentComments() {
-    super
-        .test_parsePostfixExpression_none_methodInvocation_question_dot_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
-  void
-      test_parsePostfixExpression_none_methodInvocation_typeArgumentComments() {
-    super
-        .test_parsePostfixExpression_none_methodInvocation_typeArgumentComments();
-  }
-
-  @override
-  @failingTest
-  void test_parsePrimaryExpression_listLiteral_typed_genericComment() {
-    super.test_parsePrimaryExpression_listLiteral_typed_genericComment();
-  }
-
-  @override
-  @failingTest
-  void test_parsePrimaryExpression_mapLiteral_typed_genericComment() {
-    super.test_parsePrimaryExpression_mapLiteral_typed_genericComment();
-  }
-
-  @override
-  @failingTest
   void test_parsePrimaryExpression_super() {
     super.test_parsePrimaryExpression_super();
   }
 
   @override
   @failingTest
   void test_parseRelationalExpression_as_nullable() {
     super.test_parseRelationalExpression_as_nullable();
   }
 
@@ skipping 18 matching lines @@
 
 /**
  * Implementation of [AbstractParserTestCase] specialized for testing the
  * Fasta parser.
  */
 class FastaParserTestCase extends Object
     with ParserTestHelpers
     implements AbstractParserTestCase {
   ParserProxy _parserProxy;
 
+  /**
+   * Whether generic method comments should be enabled for the test.
+   */
+  bool enableGenericMethodComments = false;
+
   @override
   set enableAssertInitializer(bool value) {
     if (value == true) {
       // TODO(paulberry,ahe): it looks like asserts in initializer lists are not
       // supported by Fasta.
       throw new UnimplementedError();
     }
   }
 
   @override
-  set enableGenericMethodComments(bool value) {
-    if (value == true) {
-      // TODO(paulberry,ahe): generic method comment syntax is not supported by
-      // Fasta.
-      throw new UnimplementedError();
-    }
-  }
-
-  @override
   set enableLazyAssignmentOperators(bool value) {
     // TODO: implement enableLazyAssignmentOperators
     if (value == true) {
       throw new UnimplementedError();
     }
   }
 
   @override
   set enableNnbd(bool value) {
     if (value == true) {
@@ skipping 22 matching lines @@
   }
 
   @override
   void assertNoErrors() {
     // TODO(paulberry): implement assertNoErrors
   }
 
   @override
   void createParser(String content) {
     var scanner = new StringScanner(content, includeComments: true);
-    _parserProxy = new ParserProxy(scanner.tokenize());
+    scanner.scanGenericMethodComments = enableGenericMethodComments;
+    _parserProxy = new ParserProxy(scanner.tokenize(),
+        enableGenericMethodComments: enableGenericMethodComments);
   }
 
   @override
   Expression parseAdditiveExpression(String code) {
     return _parseExpression(code);
   }
 
   @override
   Expression parseAssignableExpression(String code, bool primaryAllowed) {
     return _parseExpression(code);
@@ skipping 332 matching lines @@
 
   @override
   @failingTest
   void test_parseNormalFormalParameter_function_noType_nullable() {
     // TODO(scheglov): Not implemented: Nnbd
     super.test_parseNormalFormalParameter_function_noType_nullable();
   }
 
   @override
   @failingTest
-  void test_parseNormalFormalParameter_function_noType_typeParameterComments() {
-    // TODO(scheglov): Not implemented: enableGenericMethodComments=
-    super
-        .test_parseNormalFormalParameter_function_noType_typeParameterComments();
-  }
-
-  @override
-  @failingTest
   void
       test_parseNormalFormalParameter_function_noType_typeParameters_nullable() {
     // TODO(scheglov): Not implemented: Nnbd
     super
         .test_parseNormalFormalParameter_function_noType_typeParameters_nullable();
   }
 
   @override
   @failingTest
   void test_parseNormalFormalParameter_function_type_nullable() {
     // TODO(scheglov): Not implemented: Nnbd
     super.test_parseNormalFormalParameter_function_type_nullable();
   }
 
   @override
   @failingTest
-  void test_parseNormalFormalParameter_function_type_typeParameterComments() {
-    // TODO(scheglov): Not implemented: enableGenericMethodComments=
-    super.test_parseNormalFormalParameter_function_type_typeParameterComments();
-  }
-
-  @override
-  @failingTest
   void test_parseNormalFormalParameter_function_type_typeParameters_nullable() {
     // TODO(scheglov): Not implemented: Nnbd
     super
         .test_parseNormalFormalParameter_function_type_typeParameters_nullable();
   }
 
   @override
   @failingTest
   void test_parseNormalFormalParameter_function_void_nullable() {
     // TODO(scheglov): Not implemented: Nnbd
     super.test_parseNormalFormalParameter_function_void_nullable();
   }
 
   @override
   @failingTest
-  void test_parseNormalFormalParameter_function_void_typeParameterComments() {
-    // TODO(scheglov): Not implemented: enableGenericMethodComments=
-    super.test_parseNormalFormalParameter_function_void_typeParameterComments();
-  }
-
-  @override
-  @failingTest
   void test_parseNormalFormalParameter_function_void_typeParameters_nullable() {
     // TODO(scheglov): Not implemented: Nnbd
     super
         .test_parseNormalFormalParameter_function_void_typeParameters_nullable();
   }
 }
 
 /**
  * Proxy implementation of [KernelClassElement] used by Fasta parser tests.
  *
@@ skipping 39 matching lines @@
   /**
    * The builder which creates the analyzer AST data structures expected by the
    * analyzer parser tests.
    */
   final AstBuilder _astBuilder;
 
   /**
    * Creates a [ParserProxy] which is prepared to begin parsing at the given
    * Fasta token.
    */
-  factory ParserProxy(fasta.Token startingToken) {
+  factory ParserProxy(fasta.Token startingToken,
+      {bool enableGenericMethodComments: false}) {
     var library = new KernelLibraryBuilderProxy();
     var member = new BuilderProxy();
     var elementStore = new ElementStoreProxy();
     var scope = new ScopeProxy();
     var astBuilder = new AstBuilder(null, library, member, elementStore, scope);
-    return new ParserProxy._(
-        startingToken, new fasta.Parser(astBuilder), astBuilder);
+    var fastaParser = new fasta.Parser(astBuilder);
+    fastaParser.parseGenericMethodComments = enableGenericMethodComments;
+    return new ParserProxy._(startingToken, fastaParser, astBuilder);
   }
 
   ParserProxy._(this._currentFastaToken, this._fastaParser, this._astBuilder);
 
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 
   @override
   ClassMember parseClassMember(String className) {
     _astBuilder.className = className;
     var result = _run((parser) => parser.parseMember) as ClassMember;
@@ skipping 98 matching lines @@
   }
 
   @override
   @failingTest
   void test_parseStatement_emptyTypeArgumentList() {
     super.test_parseStatement_emptyTypeArgumentList();
   }
 
   @override
   @failingTest
-  void
-      test_parseStatement_functionDeclaration_noReturnType_typeParameterComments() {
-    super
-        .test_parseStatement_functionDeclaration_noReturnType_typeParameterComments();
-  }
-
-  @override
-  @failingTest
   void test_parseTryStatement_catch_finally() {
     super.test_parseTryStatement_catch_finally();
   }
 
   @override
   @failingTest
   void test_parseTryStatement_on_catch() {
     super.test_parseTryStatement_on_catch();
   }
 
@@ skipping 52 matching lines @@
   void test_parseDirectives_mixed() {
     // TODO(paulberry,ahe): This test verifies the analyzer parser's ability to
     // stop parsing as soon as the first non-directive is encountered; this is
     // useful for quickly traversing an import graph.  Consider adding a similar
     // ability to Fasta's parser.
     super.test_parseDirectives_mixed();
   }
 
   @override
   @failingTest
-  void test_parseFunctionDeclaration_functionWithTypeParameters_comment() {
-    // TODO(paulberry,ahe): generic method comment syntax is not supported by
-    // Fasta.
-    super.test_parseFunctionDeclaration_functionWithTypeParameters_comment();
-  }
-
-  @override
-  @failingTest
   void test_parsePartOfDirective_name() {
     // TODO(paulberry,ahe): Thes test verifies that even if URIs in "part of"
     // declarations are enabled, a construct of the form "part of identifier;"
     // is still properly handled.  URIs in "part of" declarations are not
     // supported by Fasta yet.
     super.test_parsePartOfDirective_name();
   }
 
   @override
   @failingTest
   void test_parsePartOfDirective_uri() {
     // TODO(paulberry,ahe): URIs in "part of" declarations are not supported by
     // Fasta.
     super.test_parsePartOfDirective_uri();
   }
 }