Fix more of the Fasta tests

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/ast/token.dart' show TokenType;
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart' show ErrorReporter;
 import 'package:analyzer/src/dart/scanner/scanner.dart';
@@ skipping 2774 matching lines @@
 
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 
   @override
   Annotation parseAnnotation() {
     return _run((parser) => parser.parseMetadata) as Annotation;
   }
 
   @override
   ArgumentList parseArgumentList() {
-    return _run((parser) => parser.parseArguments) as ArgumentList;
+    Object result = _run((parser) => parser.parseArguments);
+    if (result is MethodInvocation) {
+      return result.argumentList;
+    }
+    return result as ArgumentList;
   }
 
   @override
   ClassMember parseClassMember(String className) {
     _astBuilder.className = className;
     _eventListener.begin('CompilationUnit');
     var result = _run((parser) => parser.parseMember) as ClassMember;
     _eventListener.end('CompilationUnit');
     _astBuilder.className = null;
     return result;
@@ skipping 27 matching lines @@
     _eventListener.expectEmpty();
     return result;
   }
 
   @override
   Configuration parseConfiguration() {
     return _run((parser) => parser.parseConditionalUri) as Configuration;
   }
 
   @override
+  FunctionBody parseFunctionBody(
+      bool mayBeEmpty, ParserErrorCode emptyErrorCode, bool inExpression) {
+    return _run((parser) => (token) =>
+            parser.parseFunctionBody(token, inExpression, mayBeEmpty))
+        as FunctionBody;
+  }
+
+  @override
   Statement parseStatement2() {
     return _run((parser) => parser.parseStatement) as Statement;
   }
 
   AnnotatedNode parseTopLevelDeclaration(bool isDirective) {
     _eventListener.begin('CompilationUnit');
     _currentFastaToken =
         _fastaParser.parseTopLevelDeclaration(_currentFastaToken);
     expect(_currentFastaToken.isEof, isTrue);
     expect(_astBuilder.stack, hasLength(0));
     expect(_astBuilder.scriptTag, isNull);
     expect(_astBuilder.directives, hasLength(isDirective ? 1 : 0));
     expect(_astBuilder.declarations, hasLength(isDirective ? 0 : 1));
     _eventListener.end('CompilationUnit');
     return (isDirective ? _astBuilder.directives : _astBuilder.declarations)
         .first;
   }
 
   @override
   TypeAnnotation parseTypeAnnotation(bool inExpression) {
     return _run((parser) => parser.parseType) as TypeAnnotation;
   }
 
   @override
   TypeArgumentList parseTypeArgumentList() {
-    return _run((parser) => parser.parseTypeVariablesOpt) as TypeArgumentList;
+    return _run((parser) => parser.parseTypeArgumentsOpt) as TypeArgumentList;
+  }
+
+  @override
+  TypeName parseTypeName(bool inExpression) {
+    return _run((parser) => parser.parseType) as TypeName;
+  }
+
+  @override
+  TypeParameter parseTypeParameter() {
+    return _run((parser) => parser.parseTypeVariable) as TypeParameter;
+  }
+
+  @override
+  TypeParameterList parseTypeParameterList() {
+    return _run((parser) => parser.parseTypeVariablesOpt) as TypeParameterList;
   }
 
   /**
    * Runs a single parser function (returned by [getParseFunction]), and returns
    * the result as an analyzer AST. It checks that the parse consumed all of the
    * tokens and that there were [nodeCount] AST nodes created (unless the node
    * count is negative).
    */
   Object _run(ParseFunction getParseFunction(fasta.Parser parser),
       {int nodeCount: 1}) {
@@ skipping 915 matching lines @@
 
   @override
   @failingTest
   void test_parseArgument_unnamed() {
     // Uninteresting. Covered by the test_parseArgumentList_* methods.
     super.test_parseArgument_unnamed();
   }
 
   @override
   @failingTest
-  void test_parseArgumentList_empty() {
-    // TODO(brianwilkerson) Produces a method invocation rather than an empty
-    // argument list.
-    super.test_parseArgumentList_empty();
-  }
-
-  @override
-  @failingTest
-  void test_parseArgumentList_mixed() {
-    // TODO(brianwilkerson) Produces a method invocation rather than an empty
-    // argument list.
-    super.test_parseArgumentList_mixed();
-  }
-
-  @override
-  @failingTest
-  void test_parseArgumentList_noNamed() {
-    // TODO(brianwilkerson) Produces a method invocation rather than an empty
-    // argument list.
-    super.test_parseArgumentList_noNamed();
-  }
-
-  @override
-  @failingTest
-  void test_parseArgumentList_onlyNamed() {
-    // TODO(brianwilkerson) Produces a method invocation rather than an empty
-    // argument list.
-    super.test_parseArgumentList_onlyNamed();
-  }
-
-  @override
-  @failingTest
-  void test_parseArgumentList_trailing_comma() {
-    // TODO(brianwilkerson) Produces a method invocation rather than an empty
-    // argument list.
-    super.test_parseArgumentList_trailing_comma();
-  }
-
-  @override
-  @failingTest
   void test_parseCombinator_hide() {
     // Uninteresting. Covered by the test_parseCombinators_* methods.
     super.test_parseCombinator_hide();
   }
 
   @override
   @failingTest
   void test_parseCombinator_show() {
     // Uninteresting. Covered by the test_parseCombinators_* methods.
     super.test_parseCombinator_show();
@@ skipping 235 matching lines @@
   void test_parseFinalConstVarOrType_void_noIdentifier() {
     // TODO(brianwilkerson) exception:
     // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFinalConstVarOrType'.
     super.test_parseFinalConstVarOrType_void_noIdentifier();
   }
 
   @override
   @failingTest
   void test_parseFunctionBody_block() {
     // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
+    //   'package:front_end/src/fasta/source/stack_listener.dart': Failed assertion: line 311 pos 12: 'arrayLength > 0': is not true.
+    //   dart:core                                                          _AssertionError._throwNew
+    //   package:front_end/src/fasta/source/stack_listener.dart 311:12      Stack.pop
+    //   package:front_end/src/fasta/source/stack_listener.dart 95:25       StackListener.pop
+    //   package:analyzer/src/fasta/ast_builder.dart 287:18                 AstBuilder.endBlockFunctionBody
+    //   test/generated/parser_fasta_listener.dart 592:14                   ForwardingTestListener.endBlockFunctionBody
+    //   package:front_end/src/fasta/parser/parser.dart 2648:14             Parser.parseFunctionBody
     super.test_parseFunctionBody_block();
   }
 
   @override
   @failingTest
   void test_parseFunctionBody_block_async() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
+    // TODO(brianwilkerson) The method 'parseFunctionBody' does not handle
+    // preceding modifiers.
     super.test_parseFunctionBody_block_async();
   }
 
   @override
   @failingTest
   void test_parseFunctionBody_block_asyncGenerator() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
+    // TODO(brianwilkerson) The method 'parseFunctionBody' does not handle
+    // preceding modifiers.
     super.test_parseFunctionBody_block_asyncGenerator();
   }
 
   @override
   @failingTest
   void test_parseFunctionBody_block_syncGenerator() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
+    // TODO(brianwilkerson) The method 'parseFunctionBody' does not handle
+    // preceding modifiers.
     super.test_parseFunctionBody_block_syncGenerator();
   }
 
   @override
   @failingTest
   void test_parseFunctionBody_empty() {
     // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
+    //   'package:front_end/src/fasta/source/stack_listener.dart': Failed assertion: line 311 pos 12: 'arrayLength > 0': is not true.
+    //   dart:core                                                          _AssertionError._throwNew
+    //   package:front_end/src/fasta/source/stack_listener.dart 311:12      Stack.pop
+    //   package:front_end/src/fasta/source/stack_listener.dart 95:25       StackListener.pop
+    //   package:analyzer/src/fasta/ast_builder.dart 269:5                  AstBuilder.handleEmptyFunctionBody
+    //   test/generated/parser_fasta_listener.dart 1171:14                  ForwardingTestListener.handleEmptyFunctionBody
+    //   package:front_end/src/fasta/parser/parser.dart 2607:16             Parser.parseFunctionBody
     super.test_parseFunctionBody_empty();
   }
 
   @override
   @failingTest
   void test_parseFunctionBody_expression() {
     // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
+    //   'package:front_end/src/fasta/source/stack_listener.dart': Failed assertion: line 311 pos 12: 'arrayLength > 0': is not true.
+    //   dart:core                                                          _AssertionError._throwNew
+    //   package:front_end/src/fasta/source/stack_listener.dart 311:12      Stack.pop
+    //   package:front_end/src/fasta/source/stack_listener.dart 95:25       StackListener.pop
+    //   package:analyzer/src/fasta/ast_builder.dart 379:18                 AstBuilder.handleExpressionFunctionBody
+    //   test/generated/parser_fasta_listener.dart 1177:14                  ForwardingTestListener.handleExpressionFunctionBody
+    //   package:front_end/src/fasta/parser/parser.dart 2614:18             Parser.parseFunctionBody
     super.test_parseFunctionBody_expression();
   }
 
   @override
   @failingTest
   void test_parseFunctionBody_expression_async() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
+    // TODO(brianwilkerson) The method 'parseFunctionBody' does not handle
+    // preceding modifiers.
     super.test_parseFunctionBody_expression_async();
   }
 
   @override
   @failingTest
-  void test_parseFunctionBody_skip_block() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
-    super.test_parseFunctionBody_skip_block();
-  }
-
-  @override
-  @failingTest
-  void test_parseFunctionBody_skip_block_invalid() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
-    super.test_parseFunctionBody_skip_block_invalid();
-  }
-
-  @override
-  @failingTest
-  void test_parseFunctionBody_skip_blocks() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
-    super.test_parseFunctionBody_skip_blocks();
-  }
-
-  @override
-  @failingTest
-  void test_parseFunctionBody_skip_expression() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseFunctionBody'.
-    super.test_parseFunctionBody_skip_expression();
-  }
-
-  @override
-  @failingTest
   void test_parseIdentifierList_multiple() {
     // TODO(brianwilkerson) exception:
     // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseIdentifierList'.
     super.test_parseIdentifierList_multiple();
   }
 
   @override
   @failingTest
   void test_parseIdentifierList_single() {
     // TODO(brianwilkerson) exception:
@@ skipping 101 matching lines @@
   @failingTest
   void test_parseReturnType_void() {
     // TODO(brianwilkerson) Test isn't passing in enough context.
     // Type 'void' can't be used here because it isn't a return type.
     super.test_parseReturnType_void();
   }
 
   @override
   @failingTest
   void test_parseTypeArgumentList_empty() {
-    // TODO(brianwilkerson) reportUnrecoverableErrorWithToken
+    // TODO(brianwilkerson) Does not recover from an empty list.
     super.test_parseTypeArgumentList_empty();
   }
 
   @override
   @failingTest
-  void test_parseTypeArgumentList_multiple() {
-    // TODO(brianwilkerson) exception:
-    //   type 'TypeParameterListImpl' is not a subtype of type 'TypeArgumentList' in type cast where
-    //   TypeParameterListImpl is from package:analyzer/src/dart/ast/ast.dart
-    //   TypeArgumentList is from package:analyzer/dart/ast/ast.dart
-    //
-    //   dart:core                                                          Object._as
-    //   test/generated/parser_fasta_test.dart 2848:59                      ParserProxy.parseTypeArgumentList
-    super.test_parseTypeArgumentList_multiple();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeArgumentList_nested() {
-    // TODO(brianwilkerson) reportUnrecoverableErrorWithToken
-    super.test_parseTypeArgumentList_nested();
-  }
-
-  @override
-  @failingTest
   void test_parseTypeArgumentList_nested_withComment_double() {
-    // TODO(brianwilkerson) reportUnrecoverableErrorWithToken
+    // TODO(brianwilkerson) Does not capture comment when splitting '>>' into
+    // two tokens.
     super.test_parseTypeArgumentList_nested_withComment_double();
   }
 
   @override
   @failingTest
   void test_parseTypeArgumentList_nested_withComment_tripple() {
-    // TODO(brianwilkerson) reportUnrecoverableErrorWithToken
+    // TODO(brianwilkerson) Does not capture comment when splitting '>>' into
+    // two tokens.
     super.test_parseTypeArgumentList_nested_withComment_tripple();
   }
 
   @override
   @failingTest
-  void test_parseTypeArgumentList_single() {
-    // TODO(brianwilkerson) exception:
-    //   type 'TypeParameterListImpl' is not a subtype of type 'TypeArgumentList' in type cast where
-    //   TypeParameterListImpl is from package:analyzer/src/dart/ast/ast.dart
-    //   TypeArgumentList is from package:analyzer/dart/ast/ast.dart
-    //
-    //   dart:core                                                          Object._as
-    //   test/generated/parser_fasta_test.dart 2848:59                      ParserProxy.parseTypeArgumentList
-    super.test_parseTypeArgumentList_single();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeName_parameterized() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeName'.
-    super.test_parseTypeName_parameterized();
-  }
-
-  @override
-  @failingTest
   void test_parseTypeName_parameterized_nullable() {
     // TODO(brianwilkerson) exception:
     //   UnimplementedError
     //   test/generated/parser_fasta_test.dart 2189:7                       FastaParserTestCase.enableNnbd=
     //   test/generated/parser_test.dart 12270:5                            FastaParserTestCase&SimpleParserTestMixin.test_parseTypeName_parameterized_nullable
     super.test_parseTypeName_parameterized_nullable();
   }
 
   @override
   @failingTest
-  void test_parseTypeName_simple() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeName'.
-    super.test_parseTypeName_simple();
-  }
-
-  @override
-  @failingTest
   void test_parseTypeName_simple_nullable() {
     // TODO(brianwilkerson) exception:
     //   UnimplementedError
     //   test/generated/parser_fasta_test.dart 2189:7                       FastaParserTestCase.enableNnbd=
     //   test/generated/parser_test.dart 12270:5                            FastaParserTestCase&SimpleParserTestMixin.test_parseTypeName_parameterized_nullable
     super.test_parseTypeName_simple_nullable();
   }
 
   @override
   @failingTest
-  void test_parseTypeParameter_bounded_functionType_noReturn() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameter'.
-    super.test_parseTypeParameter_bounded_functionType_noReturn();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeParameter_bounded_functionType_return() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameter'.
-    super.test_parseTypeParameter_bounded_functionType_return();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeParameter_bounded_generic() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameter'.
-    super.test_parseTypeParameter_bounded_generic();
-  }
-
-  @override
-  @failingTest
   void test_parseTypeParameter_bounded_nullable() {
     // TODO(brianwilkerson) exception:
     //   UnimplementedError
     //   test/generated/parser_fasta_test.dart 2189:7                       FastaParserTestCase.enableNnbd=
     //   test/generated/parser_test.dart 12270:5                            FastaParserTestCase&SimpleParserTestMixin.test_parseTypeName_parameterized_nullable
     super.test_parseTypeParameter_bounded_nullable();
   }
 
   @override
   @failingTest
-  void test_parseTypeParameter_bounded_simple() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameter'.
-    super.test_parseTypeParameter_bounded_simple();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeParameter_simple() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameter'.
-    super.test_parseTypeParameter_simple();
-  }
-
-  @override
-  @failingTest
-  void test_parseTypeParameterList_multiple() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameterList'.
-    super.test_parseTypeParameterList_multiple();
-  }
-
-  @override
-  @failingTest
   void test_parseTypeParameterList_parameterizedWithTrailingEquals() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameterList'.
+    // TODO(brianwilkerson) reportUnrecoverableError
     super.test_parseTypeParameterList_parameterizedWithTrailingEquals();
   }
 
   @override
   @failingTest
   void test_parseTypeParameterList_single() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameterList'.
+    // TODO(brianwilkerson) Does not use all tokens.
     super.test_parseTypeParameterList_single();
   }
 
   @override
   @failingTest
   void test_parseTypeParameterList_withTrailingEquals() {
-    // TODO(brianwilkerson) exception:
-    // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseTypeParameterList'.
+    // TODO(brianwilkerson) reportUnrecoverableError
     super.test_parseTypeParameterList_withTrailingEquals();
   }
 
   @override
   @failingTest
   void test_parseVariableDeclaration_equals() {
     // TODO(brianwilkerson) exception:
     // NoSuchMethodError: Class 'ParserProxy' has no instance method 'parseVariableDeclaration'.
     super.test_parseVariableDeclaration_equals();
   }
@@ skipping 25 matching lines @@
 
 /**
  * Tests of the fasta parser based on [StatementParserTestMixin].
  */
 @reflectiveTest
 class StatementParserTest_Fasta extends FastaParserTestCase
     with StatementParserTestMixin {
   @override
   @failingTest
   void test_parseAssertStatement_trailingComma_message() {
+    // TODO(brianwilkerson) Does not handle optional trailing comma.
     super.test_parseAssertStatement_trailingComma_message();
   }
 
   @override
   @failingTest
   void test_parseAssertStatement_trailingComma_noMessage() {
+    // TODO(brianwilkerson) Does not handle optional trailing comma.
     super.test_parseAssertStatement_trailingComma_noMessage();
   }
 
   @override
   @failingTest
   void test_parseBreakStatement_noLabel() {
+    // TODO(brianwilkerson)
+    // Expected 1 errors of type ParserErrorCode.BREAK_OUTSIDE_OF_LOOP, found 0
     super.test_parseBreakStatement_noLabel();
   }
 
   @override
   @failingTest
   void test_parseContinueStatement_label() {
+    // TODO(brianwilkerson)
+    // Expected 1 errors of type ParserErrorCode.CONTINUE_OUTSIDE_OF_LOOP, found 0
     super.test_parseContinueStatement_label();
   }
 
   @override
   @failingTest
   void test_parseContinueStatement_noLabel() {
+    // TODO(brianwilkerson)
+    // Expected 1 errors of type ParserErrorCode.CONTINUE_OUTSIDE_OF_LOOP, found 0
     super.test_parseContinueStatement_noLabel();
   }
 
   @override
   @failingTest
   void test_parseStatement_emptyTypeArgumentList() {
+    // TODO(brianwilkerson) Does not recover from empty list.
     super.test_parseStatement_emptyTypeArgumentList();
   }
-
-  @override
-  @failingTest
-  void test_parseTryStatement_catch_finally() {
-    super.test_parseTryStatement_catch_finally();
-  }
-
-  @override
-  @failingTest
-  void test_parseTryStatement_on_catch() {
-    super.test_parseTryStatement_on_catch();
-  }
-
-  @override
-  @failingTest
-  void test_parseTryStatement_on_catch_finally() {
-    super.test_parseTryStatement_on_catch_finally();
-  }
 }
 
 /**
  * Tests of the fasta parser based on [TopLevelParserTestMixin].
  */
 @reflectiveTest
 class TopLevelParserTest_Fasta extends FastaParserTestCase
     with TopLevelParserTestMixin {
   void test_parseClassDeclaration_native_allowed() {
     allowNativeClause = true;
@@ skipping 81 matching lines @@
   @override
   @failingTest
   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();
   }
 }