Move tests for parseVariableDeclarationList(), fix for keywords.

pkg/analyzer/test/generated/parser_test.dart

 // Copyright (c) 2014, 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.
 
 library analyzer.test.generated.parser_test;
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
@@ skipping 178 matching lines @@
 
   Expression parseStringLiteral(String code);
 
   SymbolLiteral parseSymbolLiteral(String code);
 
   Expression parseThrowExpression(String code);
 
   Expression parseThrowExpressionWithoutCascade(String code);
 
   PrefixExpression parseUnaryExpression(String code);
+
+  VariableDeclarationList parseVariableDeclarationList(String source);
 }
 
 /**
  * Instances of the class `AstValidator` are used to validate the correct construction of an
  * AST structure.
  */
 class AstValidator extends UnifyingAstVisitor<Object> {
   /**
    * A list containing the errors found while traversing the AST structure.
    */
@@ skipping 7902 matching lines @@
    * Parses a single top level member of a compilation unit (other than a
    * directive), including any comment and/or metadata that precedes it.
    */
   CompilationUnitMember parseFullCompilationUnitMember() =>
       parser.parseCompilationUnitMember(parser.parseCommentAndMetadata());
 
   @override
   Directive parseFullDirective() =>
       parser.parseDirective(parser.parseCommentAndMetadata());
 
-  /**
-   * Parses a variable declaration list (equivalent to a variable declaration
-   * statement, but without the final comma).
-   */
-  VariableDeclarationList parseFullVariableDeclarationList() =>
-      parser.parseVariableDeclarationListAfterMetadata(
-          parser.parseCommentAndMetadata());
-
   @override
   FunctionExpression parseFunctionExpression(String code) {
     createParser(code);
     return parser.parseFunctionExpression();
   }
 
   @override
   InstanceCreationExpression parseInstanceCreationExpression(
       String code, Token newToken) {
     createParser(code);
@@ skipping 182 matching lines @@
     return parser.parseThrowExpressionWithoutCascade();
   }
 
   @override
   PrefixExpression parseUnaryExpression(String code) {
     createParser(code);
     return parser.parseUnaryExpression();
   }
 
   @override
+  VariableDeclarationList parseVariableDeclarationList(String code) {
+    createParser(code);
+    CommentAndMetadata commentAndMetadata = parser.parseCommentAndMetadata();
+    return parser.parseVariableDeclarationListAfterMetadata(commentAndMetadata);
+  }
+
+  @override
   void setUp() {
     super.setUp();
     parseFunctionBodies = true;
   }
 }
 
 /**
  * Helper methods that aid in parser tests.
  *
  * Intended to be mixed in to parser test case classes.
@@ skipping 3386 matching lines @@
   void test_parseVariableDeclaration_noEquals() {
     createParser('a');
     VariableDeclaration declaration = parser.parseVariableDeclaration();
     expectNotNullIfNoErrors(declaration);
     listener.assertNoErrors();
     expect(declaration.name, isNotNull);
     expect(declaration.equals, isNull);
     expect(declaration.initializer, isNull);
   }
 
-  void test_parseVariableDeclarationListAfterMetadata_const_noType() {
-    createParser('const a');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNotNull);
-    expect(declarationList.type, isNull);
-    expect(declarationList.variables, hasLength(1));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_const_type() {
-    createParser('const A a');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNotNull);
-    expect(declarationList.type, isNotNull);
-    expect(declarationList.variables, hasLength(1));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_final_noType() {
-    createParser('final a');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNotNull);
-    expect(declarationList.type, isNull);
-    expect(declarationList.variables, hasLength(1));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_final_type() {
-    createParser('final A a');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNotNull);
-    expect(declarationList.type, isNotNull);
-    expect(declarationList.variables, hasLength(1));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_final_typeComment() {
-    enableGenericMethodComments = true;
-    createParser('final/*=T*/ x');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect((declarationList.type as TypeName).name.name, 'T');
-    expect(declarationList.isFinal, true);
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_type_multiple() {
-    createParser('A a, b, c');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNull);
-    expect(declarationList.type, isNotNull);
-    expect(declarationList.variables, hasLength(3));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_type_single() {
-    createParser('A a');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNull);
-    expect(declarationList.type, isNotNull);
-    expect(declarationList.variables, hasLength(1));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_var_multiple() {
-    createParser('var a, b, c');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNotNull);
-    expect(declarationList.type, isNull);
-    expect(declarationList.variables, hasLength(3));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_var_single() {
-    createParser('var a');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNotNull);
-    expect(declarationList.type, isNull);
-    expect(declarationList.variables, hasLength(1));
-  }
-
-  void test_parseVariableDeclarationListAfterMetadata_var_typeComment() {
-    enableGenericMethodComments = true;
-    createParser('var/*=T*/ x');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect((declarationList.type as TypeName).name.name, 'T');
-    expect(declarationList.keyword, isNull);
-  }
-
-  void test_parseVariableDeclarationListAfterType_type() {
-    createParser('T a');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword, isNull);
-    expect((declarationList.type as TypeName).name.name, 'T');
-    expect(declarationList.variables, hasLength(1));
-  }
-
-  void test_parseVariableDeclarationListAfterType_var() {
-    createParser('var a, b, c');
-    VariableDeclarationList declarationList =
-        parseFullVariableDeclarationList();
-    expectNotNullIfNoErrors(declarationList);
-    listener.assertNoErrors();
-    expect(declarationList.keyword.lexeme, 'var');
-    expect(declarationList.type, isNull);
-    expect(declarationList.variables, hasLength(3));
-  }
-
   void test_parseWithClause_multiple() {
     createParser('with A, B, C');
     WithClause clause = parser.parseWithClause();
     expectNotNullIfNoErrors(clause);
     listener.assertNoErrors();
     expect(clause.withKeyword, isNotNull);
     expect(clause.mixinTypes, hasLength(3));
   }
 
   void test_parseWithClause_single() {
@@ skipping 1035 matching lines @@
     expect(clause.exceptionType, isNotNull);
     expect(clause.catchKeyword, isNotNull);
     expect(clause.exceptionParameter, isNotNull);
     expect(clause.comma, isNotNull);
     expect(clause.stackTraceParameter, isNotNull);
     expect(clause.body, isNotNull);
     expect(statement.finallyKeyword, isNotNull);
     expect(statement.finallyBlock, isNotNull);
   }
 
+  void test_parseVariableDeclarationListAfterMetadata_const_noType() {
+    var declarationList = parseVariableDeclarationList('const a');
+    assertNoErrors();
+    expect(declarationList.keyword.lexeme, 'const');
+    expect(declarationList.type, isNull);
+    expect(declarationList.variables, hasLength(1));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_const_type() {
+    var declarationList = parseVariableDeclarationList('const A a');
+    assertNoErrors();
+    expect(declarationList.keyword.lexeme, 'const');
+    expect(declarationList.type, isNotNull);
+    expect(declarationList.variables, hasLength(1));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_const_typeComment() {
+    enableGenericMethodComments = true;
+    var declarationList = parseVariableDeclarationList('const/*=T*/ a');
+    assertNoErrors();
+    expect((declarationList.type as TypeName).name.name, 'T');
+    expect(declarationList.isConst, true);
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_dynamic_typeComment() {
+    enableGenericMethodComments = true;
+    var declarationList = parseVariableDeclarationList('dynamic/*=T*/ a');
+    assertNoErrors();
+    expect((declarationList.type as TypeName).name.name, 'T');
+    expect(declarationList.keyword, isNull);
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_final_noType() {
+    var declarationList = parseVariableDeclarationList('final a');
+    assertNoErrors();
+    expect(declarationList.keyword, isNotNull);
+    expect(declarationList.type, isNull);
+    expect(declarationList.variables, hasLength(1));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_final_type() {
+    var declarationList = parseVariableDeclarationList('final A a');
+    assertNoErrors();
+    expect(declarationList.keyword.lexeme, 'final');
+    expect(declarationList.type, isNotNull);
+    expect(declarationList.variables, hasLength(1));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_final_typeComment() {
+    enableGenericMethodComments = true;
+    var declarationList = parseVariableDeclarationList('final/*=T*/ a');
+    assertNoErrors();
+    expect((declarationList.type as TypeName).name.name, 'T');
+    expect(declarationList.isFinal, true);
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_type_multiple() {
+    var declarationList = parseVariableDeclarationList('A a, b, c');
+    assertNoErrors();
+    expect(declarationList.keyword, isNull);
+    expect(declarationList.type, isNotNull);
+    expect(declarationList.variables, hasLength(3));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_type_single() {
+    var declarationList = parseVariableDeclarationList('A a');
+    assertNoErrors();
+    expect(declarationList.keyword, isNull);
+    expect(declarationList.type, isNotNull);
+    expect(declarationList.variables, hasLength(1));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_type_typeComment() {
+    enableGenericMethodComments = true;
+    var declarationList = parseVariableDeclarationList('int/*=T*/ a');
+    assertNoErrors();
+    expect((declarationList.type as TypeName).name.name, 'T');
+    expect(declarationList.keyword, isNull);
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_var_multiple() {
+    var declarationList = parseVariableDeclarationList('var a, b, c');
+    assertNoErrors();
+    expect(declarationList.keyword.lexeme, 'var');
+    expect(declarationList.type, isNull);
+    expect(declarationList.variables, hasLength(3));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_var_single() {
+    var declarationList = parseVariableDeclarationList('var a');
+    assertNoErrors();
+    expect(declarationList.keyword.lexeme, 'var');
+    expect(declarationList.type, isNull);
+    expect(declarationList.variables, hasLength(1));
+  }
+
+  void test_parseVariableDeclarationListAfterMetadata_var_typeComment() {
+    enableGenericMethodComments = true;
+    var declarationList = parseVariableDeclarationList('var/*=T*/ a');
+    assertNoErrors();
+    expect((declarationList.type as TypeName).name.name, 'T');
+    expect(declarationList.keyword, isNull);
+  }
+
   void test_parseVariableDeclarationStatementAfterMetadata_multiple() {
     var statement =
         parseStatement('var x, y, z;') as VariableDeclarationStatement;
     assertNoErrors();
     expect(statement.semicolon, isNotNull);
     VariableDeclarationList variableList = statement.variables;
     expect(variableList, isNotNull);
     expect(variableList.variables, hasLength(3));
   }
 
@@ skipping 1825 matching lines @@
     expectCommentText(typeVariable.documentationComment, '/// Doc');
   }
 
   /**
    * Assert that the given [name] is in declaration context.
    */
   void _assertIsDeclarationName(SimpleIdentifier name) {
     expect(name.inDeclarationContext(), isTrue);
   }
 }