Include ':' before constructor separators into AST with Fasta.

pkg/analyzer/lib/src/fasta/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:analyzer/analyzer.dart';
 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory;
 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard;
 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token;
@@ skipping 388 matching lines @@
         toAnalyzerToken(elseToken),
         elsePart));
   }
 
   void prepareInitializers() {
     debugEvent("prepareInitializers");
   }
 
   void handleNoInitializers() {
     debugEvent("NoInitializers");
+    push(NullValue.ConstructorInitializerSeparator);
     push(NullValue.ConstructorInitializers);
   }
 
   void endInitializers(int count, Token beginToken, Token endToken) {
     debugEvent("Initializers");
     List<Object> initializerObjects = popList(count) ?? const [];
 
+    push(beginToken);
+
     var initializers = <ConstructorInitializer>[];
     for (Object initializerObject in initializerObjects) {
       if (initializerObject is FunctionExpressionInvocation) {
         Expression function = initializerObject.function;
         if (function is SuperExpression) {
           initializers.add(ast.superConstructorInvocation(function.superKeyword,
               null, null, initializerObject.argumentList));
         } else {
           initializers.add(ast.redirectingConstructorInvocation(
               (function as ThisExpression).thisKeyword,
@@ skipping 1134 matching lines @@
     SimpleIdentifier name = pop();
     push(ast.variableDeclaration(
         name, toAnalyzerToken(assignment), initializer));
   }
 
   @override
   void endFunction(Token getOrSet, Token endToken) {
     debugEvent("Function");
     FunctionBody body = pop();
     pop(); // constructor initializers
+    pop(); // ":" before constructor initializers
     FormalParameterList parameters = pop();
     TypeParameterList typeParameters = pop();
     // TODO(scheglov) It is an error if "getOrSet" is not null.
     push(ast.functionExpression(typeParameters, parameters, body));
   }
 
   @override
   void endFunctionDeclaration(Token token) {
     debugEvent("FunctionDeclaration");
     FunctionExpression functionExpression = pop();
@@ skipping 45 matching lines @@
     push(ast.typeParameterList(toAnalyzerToken(beginToken), typeParameters,
         toAnalyzerToken(endToken)));
   }
 
   @override
   void endMethod(Token getOrSet, Token beginToken, Token endToken) {
     debugEvent("Method");
     FunctionBody body = pop();
     ConstructorName redirectedConstructor = null; // TODO(paulberry)
     List<ConstructorInitializer> initializers = pop() ?? const [];
-    Token separator = null; // TODO(paulberry)
+    Token separator = pop();
     FormalParameterList parameters = pop();
-    TypeParameterList typeParameters = pop(); // TODO(paulberry)
+    TypeParameterList typeParameters = pop();
     var name = pop();
-    TypeAnnotation returnType = pop(); // TODO(paulberry)
+    TypeAnnotation returnType = pop();
     _Modifiers modifiers = pop();
     List<Annotation> metadata = pop();
     Comment comment = pop();
 
     void constructor(SimpleIdentifier returnType, analyzer.Token period,
         SimpleIdentifier name) {
       push(ast.constructorDeclaration(
           comment,
           metadata,
           toAnalyzerToken(modifiers?.externalKeyword),
@@ skipping 299 matching lines @@
       } else if (identical('static', s)) {
         staticKeyword = token;
       } else if (identical('var', s)) {
         finalConstOrVarKeyword = token;
       } else {
         internalError('Unhandled modifier: $s');
       }
     }
   }
 }