Capture const/final/var keyword in AstBuilder.endTopLevelFields.

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

 // Copyright (c) 2016, 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 fasta.analyzer.ast_builder;
 
 import 'package:front_end/src/fasta/scanner/token.dart'
     show BeginGroupToken, Token;
 
 import 'package:analyzer/analyzer.dart';
@@ skipping 45 matching lines @@
   bool isFirstIdentifier = false;
 
   @override
   final Uri uri;
 
   /// If `true`, the first call to [handleIdentifier] should push a
   /// List<SimpleIdentifier> on the stack, and [handleQualified] should append
   /// to the list.
   var accumulateIdentifierComponents = false;
 
-
   AstBuilder(this.library, this.member, this.elementStore, Scope scope,
       [Uri uri])
-      : uri = uri ?? library.fileUri, super(scope);
+      : uri = uri ?? library.fileUri,
+        super(scope);
 
   createJumpTarget(JumpTargetKind kind, int charOffset) {
     // TODO(ahe): Implement jump targets.
     return null;
   }
 
   void beginLiteralString(Token token) {
     debugEvent("beginLiteralString");
     push(token);
   }
@@ skipping 893 matching lines @@
     Expression initializer = pop();
     SimpleIdentifier name = pop();
     push(ast.variableDeclaration(
         name, toAnalyzerToken(assignment), initializer));
   }
 
   void endTopLevelFields(int count, Token beginToken, Token endToken) {
     debugEvent("TopLevelFields");
     List<VariableDeclaration> variables = popList(count);
     TypeAnnotation type = pop();
-    // TODO(paulberry): the var/const/final keyword should be pointed to by
-    // beginToken.
-    var keyword = null; // TODO(paulberry)
+    var keyword;
+    if (optional('var', beginToken) ||
+        optional('const', beginToken) ||
+        optional('final', beginToken)) {
+      keyword = beginToken;
+    }
     var variableList = ast.variableDeclarationList(
         null, null, toAnalyzerToken(keyword), type, variables);
     var modifiers = pop();
     assert(modifiers == null); // TODO(paulberry)
     List<Annotation> metadata = pop();
     Comment comment = null; // TODO(paulberry)
     push(ast.topLevelVariableDeclaration(
         comment, metadata, variableList, toAnalyzerToken(endToken)));
   }
 }
@@ skipping 21 matching lines @@
 /// [ClassDeclaration] or [ClassTypeAlias] object.
 class _MixinApplication {
   final TypeName supertype;
 
   final Token withKeyword;
 
   final List<TypeName> mixinTypes;
 
   _MixinApplication(this.supertype, this.withKeyword, this.mixinTypes);
 }