Improve primare expression parsing 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/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/src/generated/parser.dart' as analyzer;
 import 'package:analyzer/src/generated/utilities_dart.dart';
@@ skipping 452 matching lines @@
   }
 
   @override
   @failingTest
   void test_parseListLiteral_empty_oneToken_withComment() {
     super.test_parseListLiteral_empty_oneToken_withComment();
   }
 
   @override
   @failingTest
-  void test_parseListOrMapLiteral_map_noType() {
-    super.test_parseListOrMapLiteral_map_noType();
-  }
-
-  @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() {
-    super.test_parsePrimaryExpression_mapLiteral();
-  }
-
-  @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();
   }
 
   @override
   @failingTest
   void test_parseRelationalExpression_is_nullable() {
     super.test_parseRelationalExpression_is_nullable();
   }
@@ skipping 261 matching lines @@
     if (typeArgumentsCode != null) {
       sc += typeArgumentsCode;
     }
     sc += code;
     return _parseExpression(sc);
   }
 
   @override
   TypedLiteral parseListOrMapLiteral(analyzer.Token modifier, String code) {
     String literalCode = modifier != null ? '$modifier $code' : code;
-    return _parseExpression(literalCode);
+    return parsePrimaryExpression(literalCode) as TypedLiteral;
   }
 
   @override
   Expression parseLogicalAndExpression(String code) {
     return _parseExpression(code);
   }
 
   @override
   Expression parseLogicalOrExpression(String code) {
     return _parseExpression(code);
   }
 
   @override
   MapLiteral parseMapLiteral(
       analyzer.Token token, String typeArgumentsCode, String code) {
     String sc = '';
     if (token != null) {
       sc += token.lexeme + ' ';
     }
     if (typeArgumentsCode != null) {
       sc += typeArgumentsCode;
     }
     sc += code;
-    return _parseMapLiteralCode(sc);
+    return parsePrimaryExpression(sc) as MapLiteral;
   }
 
   @override
   MapLiteralEntry parseMapLiteralEntry(String code) {
-    return _parseMapLiteralCode('{$code}').entries.single;
+    var mapLiteral = parseMapLiteral(null, null, '{ $code }');
+    return mapLiteral.entries.single;
   }
 
   @override
   Expression parseMultiplicativeExpression(String code) {
     return _parseExpression(code);
   }
 
   @override
   InstanceCreationExpression parseNewExpression(String code) {
     return _parseExpression(code);
@@ skipping 13 matching lines @@
     return _parseExpression(code);
   }
 
   @override
   Identifier parsePrefixedIdentifier(String code) {
     return _parseExpression(code);
   }
 
   @override
   Expression parsePrimaryExpression(String code) {
-    return _parseExpression(code);
+    return _runParser(
+            code, (parser) => parser.parsePrimary, const <ErrorCode>[])
+        as Expression;
   }
 
   @override
   Expression parseRelationalExpression(String code) {
     return _parseExpression(code);
   }
 
   @override
   RethrowExpression parseRethrowExpression(String code) {
     return _parseExpression(code);
@@ skipping 46 matching lines @@
   @override
   PrefixExpression parseUnaryExpression(String code) {
     return _parseExpression(code);
   }
 
   Expression _parseExpression(String code) {
     var statement = parseStatement('$code;') as ExpressionStatement;
     return statement.expression;
   }
 
-  MapLiteral _parseMapLiteralCode(String code) {
-    var statement =
-        parseStatement('var v = $code;') as VariableDeclarationStatement;
-    return statement.variables.variables.single.initializer as MapLiteral;
-  }
-
   Object _runParser(
       String source, ParseFunction getParseFunction(fasta.Parser parser),
       [List<ErrorCode> errorCodes = const <ErrorCode>[]]) {
     if (errorCodes.isNotEmpty) {
       // TODO(paulberry): Check that the parser generates the proper errors.
       throw new UnimplementedError();
     }
     createParser(source);
     return _parserProxy._run(getParseFunction);
   }
@@ skipping 261 matching lines @@
   @override
   @failingTest
   void
       test_parseCompilationUnitMember_function_generic_noReturnType_annotated() {
     // TODO(paulberry,ahe): Fasta doesn't appear to support annotated type
     // parameters.
     super
         .test_parseCompilationUnitMember_function_generic_noReturnType_annotated();
   }
 
-  void test_parseCompilationUnitMember_typedef() {
-    // TODO(paulberry): Unhandled event: FunctionTypeAlias
-    super.test_parseCompilationUnitMember_typedef();
-  }
-
   @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();
   }
 
@@ skipping 44 matching lines @@
   }
 
   @override
   @failingTest
   void test_parsePartOfDirective_uri() {
     // TODO(paulberry,ahe): URIs in "part of" declarations are not supported by
     // Fasta.
     super.test_parsePartOfDirective_uri();
   }
 }