Ensure locations are always provided, but don't store them yet.

pkg/front_end/lib/src/fasta/source/outline_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.outline_builder;
 
 import 'package:kernel/ast.dart' show
     AsyncMarker,
     ProcedureKind;
 
@@ skipping 77 matching lines @@
   Uri get uri => library.uri;
 
   @override
   void endMetadata(Token beginToken, Token periodBeforeName, Token endToken) {
     debugEvent("Metadata");
     List arguments = pop();
     String postfix = popIfNotNull(periodBeforeName);
     List<TypeBuilder> typeArguments = pop();
     if (arguments == null) {
       String expression = pop();
-      push(new MetadataBuilder.fromExpression(expression, postfix));
+      push(new MetadataBuilder.fromExpression(expression, postfix, library,
+              beginToken.charOffset));
     } else {
       String typeName = pop();
       push(new MetadataBuilder.fromConstructor(
                library.addConstructorReference(
-                   typeName, typeArguments, postfix), arguments));
+                   typeName, typeArguments, postfix,
+                   beginToken.next.charOffset),
+               arguments, library, beginToken.charOffset));
     }
   }
 
   @override
   void endHide(Token hideKeyword) {
     debugEvent("Hide");
     List<String> names = pop();
-    push(new Combinator.hide(names));
+    push(new Combinator.hide(names, hideKeyword.charOffset, library.fileUri));
   }
 
   @override
   void endShow(Token showKeyword) {
     debugEvent("Show");
     List<String> names = pop();
-    push(new Combinator.show(names));
+    push(new Combinator.show(names, showKeyword.charOffset, library.fileUri));
   }
 
   @override
   void endCombinators(int count) {
     debugEvent("Combinators");
     push(popList(count) ?? NullValue.Combinators);
   }
 
   @override
   void endExport(Token exportKeyword, Token semicolon) {
     debugEvent("Export");
     List<Combinator> combinators = pop();
     Unhandled conditionalUris = pop();
     String uri = pop();
     List<MetadataBuilder> metadata = pop();
-    library.addExport(metadata, uri, conditionalUris, combinators);
+    library.addExport(
+        metadata, uri, conditionalUris, combinators, exportKeyword.charOffset);
     checkEmpty();
   }
 
   @override
   void endImport(Token importKeyword, Token deferredKeyword, Token asKeyword,
       Token semicolon) {
     debugEvent("endImport");
     List<Combinator> combinators = pop();
     String prefix = popIfNotNull(asKeyword);
     Unhandled conditionalUris = pop();
     String uri = pop();
     List<MetadataBuilder> metadata = pop();
     library.addImport(metadata, uri, conditionalUris, prefix, combinators,
-        deferredKeyword != null);
+        deferredKeyword != null, importKeyword.charOffset,
+        asKeyword?.next?.charOffset ?? -1);
     checkEmpty();
   }
 
   @override
   void endPart(Token partKeyword, Token semicolon) {
     debugEvent("Part");
     String uri = pop();
     List<MetadataBuilder> metadata = pop();
     library.addPart(metadata, uri);
     checkEmpty();
@@ skipping 36 matching lines @@
   @override
   void endClassDeclaration(int interfacesCount, Token beginToken,
       Token extendsKeyword, Token implementsKeyword, Token endToken) {
     debugEvent("endClassDeclaration");
     List<TypeBuilder> interfaces = popList(interfacesCount);
     TypeBuilder supertype = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
-    library.addClass(
-        metadata, modifiers, name, typeVariables, supertype, interfaces);
+    library.addClass(metadata, modifiers, name, typeVariables, supertype,
+        interfaces, beginToken.charOffset);
     checkEmpty();
   }
 
   ProcedureKind computeProcedureKind(Token token) {
     if (token == null) return ProcedureKind.Method;
     if (optional("get", token)) return ProcedureKind.Getter;
     if (optional("set", token)) return ProcedureKind.Setter;
     return internalError("Unhandled: ${token.value}");
   }
 
@@ skipping 10 matching lines @@
     AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     TypeBuilder returnType = pop();
     int modifiers = Modifier.validate(pop(),
         isAbstract: kind == MethodBody.Abstract);
     List<MetadataBuilder> metadata = pop();
     checkEmpty();
     return library.addProcedure(metadata, modifiers, returnType, name,
-        typeVariables, formals, asyncModifier, computeProcedureKind(getOrSet));
+        typeVariables, formals, asyncModifier, computeProcedureKind(getOrSet),
+        beginToken.charOffset);
   }
 
   @override
   void handleNoFunctionBody(Token token) {
     debugEvent("NoFunctionBody");
     push(MethodBody.Abstract);
   }
 
   @override
   void handleFunctionBodySkipped(Token token) {
@@ skipping 28 matching lines @@
       kind = ProcedureKind.Operator;
     } else {
       name = nameOrOperator;
       kind = computeProcedureKind(getOrSet);
     }
     TypeBuilder returnType = pop();
     int modifiers = Modifier.validate(pop(),
         isAbstract: bodyKind == MethodBody.Abstract);
     List<MetadataBuilder> metadata = pop();
     library.addProcedure(metadata, modifiers, returnType, name, typeVariables,
-        formals, asyncModifier, kind);
+        formals, asyncModifier, kind, beginToken.charOffset);
   }
 
   @override
   void endMixinApplication() {
     debugEvent("MixinApplication");
     List<TypeBuilder> mixins = pop();
     TypeBuilder supertype = pop();
-    push(library.addMixinApplication(supertype, mixins));
+    push(library.addMixinApplication(supertype, mixins, -1));
   }
 
   @override
   void beginNamedMixinApplication(Token token) {
     library.beginNestedDeclaration(hasMembers: false);
   }
 
   @override
   void endNamedMixinApplication(
       Token classKeyword, Token implementsKeyword, Token endToken) {
     debugEvent("endNamedMixinApplication");
     List<TypeBuilder> interfaces = popIfNotNull(implementsKeyword);
     TypeBuilder mixinApplication = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
     library.addNamedMixinApplication(
-        metadata, name, typeVariables, modifiers, mixinApplication, interfaces);
+        metadata, name, typeVariables, modifiers, mixinApplication, interfaces,
+        classKeyword.charOffset);
     checkEmpty();
   }
 
   @override
   void endTypeArguments(int count, Token beginToken, Token endToken) {
     debugEvent("TypeArguments");
     push(popList(count) ?? NullValue.TypeArguments);
   }
 
   @override
   void endType(Token beginToken, Token endToken) {
     debugEvent("Type");
     List<TypeBuilder> arguments = pop();
     String name = pop();
-    push(library.addNamedType(name, arguments));
+    push(library.addNamedType(name, arguments, beginToken.charOffset));
   }
 
   @override
   void endTypeList(int count) {
     debugEvent("TypeList");
     push(popList(count) ?? NullValue.TypeList);
   }
 
   @override
   void endTypeVariables(int count, Token beginToken, Token endToken) {
     debugEvent("TypeVariables");
     push(popList(count) ?? NullValue.TypeVariables);
   }
 
   @override
   void handleVoidKeyword(Token token) {
     debugEvent("VoidKeyword");
-    push(library.addVoidType());
+    push(library.addVoidType(token.charOffset));
   }
 
   @override
   void endFormalParameter(Token thisKeyword) {
     debugEvent("FormalParameter");
     String name = pop();
     TypeBuilder type = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
+    // TODO(ahe): Needs begin token.
     push(library.addFormalParameter(metadata, modifiers, type, name,
-             thisKeyword != null));
+             thisKeyword != null, thisKeyword?.charOffset ?? -1));
   }
 
   @override
   void handleValuedFormalParameter(Token equals, Token token) {
     debugEvent("ValuedFormalParameter");
     // Ignored for now.
   }
 
   @override
   void endFunctionTypedFormalParameter(Token token) {
@@ skipping 45 matching lines @@
       formals = new List<FormalParameterBuilder>.from(formals);
     }
     push(formals ?? NullValue.FormalParameters);
   }
 
   @override
   void endEnum(Token enumKeyword, Token endBrace, int count) {
     List<String> constants = popList(count);
     String name = pop();
     List<MetadataBuilder> metadata = pop();
-    library.addEnum(metadata, name, constants);
+    library.addEnum(metadata, name, constants, enumKeyword.charOffset);
     checkEmpty();
   }
 
   @override
   void beginFunctionTypeAlias(Token token) {
     library.beginNestedDeclaration(hasMembers: false);
   }
 
   @override
   void endFunctionTypeAlias(Token typedefKeyword, Token endToken) {
     debugEvent("endFunctionTypeAlias");
     List<FormalParameterBuilder> formals = pop();
     List<TypeVariableBuilder> typeVariables = pop();
     String name = pop();
     TypeBuilder returnType = pop();
     List<MetadataBuilder> metadata = pop();
     library.addFunctionTypeAlias(
-        metadata, returnType, name, typeVariables, formals);
+        metadata, returnType, name, typeVariables, formals,
+        typedefKeyword.charOffset);
     checkEmpty();
   }
 
   @override
   void endTopLevelFields(int count, Token beginToken, Token endToken) {
     debugEvent("endTopLevelFields");
     List<String> names = popList(count);
     TypeBuilder type = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
     library.addFields(metadata, modifiers, type, names);
     checkEmpty();
   }
 
   @override
   void endFields(int count, Token beginToken, Token endToken) {
     debugEvent("Fields");
     List<String> names = popList(count);
     TypeBuilder type = pop();
     int modifiers = Modifier.validate(pop());
     List<MetadataBuilder> metadata = pop();
     library.addFields(metadata, modifiers, type, names);
   }
 
   @override
   void endTypeVariable(Token token, Token extendsOrSuper) {
     debugEvent("endTypeVariable");
     TypeBuilder bound = pop();
     String name = pop();
-    push(library.addTypeVariable(name, bound));
+    push(library.addTypeVariable(name, bound, token.charOffset));
   }
 
   @override
   void endPartOf(Token partKeyword, Token semicolon) {
     debugEvent("endPartOf");
     String name = pop();
     List<MetadataBuilder> metadata = pop();
     library.addPartOf(metadata, name);
   }
 
   @override
   void endConstructorReference(
       Token start, Token periodBeforeName, Token endToken) {
     debugEvent("ConstructorReference");
     String suffix = popIfNotNull(periodBeforeName);
     List<TypeBuilder> typeArguments = pop();
     String name = pop();
-    push(library.addConstructorReference(name, typeArguments, suffix));
+    push(library.addConstructorReference(
+            name, typeArguments, suffix, start.charOffset));
   }
 
   @override
   void endFactoryMethod(Token beginToken, Token endToken) {
     debugEvent("FactoryMethod");
     MethodBody kind = pop();
     ConstructorReferenceBuilder redirectionTarget;
     if (kind == MethodBody.RedirectingFactoryBody) {
       redirectionTarget = pop();
     }
     AsyncMarker asyncModifier = pop();
     List<FormalParameterBuilder> formals = pop();
     var name = pop();
     List<MetadataBuilder> metadata = pop();
     library.addFactoryMethod(metadata, name, formals, asyncModifier,
-        redirectionTarget);
+        redirectionTarget, beginToken.charOffset);
   }
 
   @override
   void endRedirectingFactoryBody(Token beginToken, Token endToken) {
     debugEvent("RedirectingFactoryBody");
     push(MethodBody.RedirectingFactoryBody);
   }
 
   @override
   void endFieldInitializer(Token assignmentOperator) {
@@ skipping 59 matching lines @@
   Link<Token> handleMemberName(Link<Token> identifiers) {
     if (!isDartLibrary || identifiers.isEmpty) return identifiers;
     return removeNativeClause(identifiers);
   }
 
   @override
   void debugEvent(String name) {
     // printEvent(name);
   }
 }