[fasta] Add and correct more offsets

pkg/front_end/lib/src/fasta/kernel/builder_accessors.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.builder_accessors;
 
 export 'frontend_accessors.dart' show wrapInvalid;
 
 import 'frontend_accessors.dart' show Accessor;
 
@@ skipping 124 matching lines @@
   doInvocation(int charOffset, Arguments arguments) => this;
 
   buildPropertyAccess(IncompleteSend send, bool isNullAware) => this;
 
   buildThrowNoSuchMethodError(Arguments arguments) => this;
 
   Expression buildAssignment(Expression value, {bool voidContext: false}) {
     return buildError();
   }
 
-  Expression buildCompoundAssignment(Name binaryOperator, Expression value,
+  Expression buildCompoundAssignment(
+      Name binaryOperator, Expression value, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return buildError();
   }
 
-  Expression buildPrefixIncrement(Name binaryOperator,
+  Expression buildPrefixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return buildError();
   }
 
-  Expression buildPostfixIncrement(Name binaryOperator,
+  Expression buildPostfixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return buildError();
   }
 
   Expression buildNullAwareAssignment(Expression value, DartType type,
       {bool voidContext: false}) {
     return buildError();
   }
 
   Expression buildSimpleRead() => buildError();
@@ skipping 85 matching lines @@
 
   Expression buildAssignment(Expression value, {bool voidContext: false}) {
     return internalError("");
   }
 
   Expression buildNullAwareAssignment(Expression value, DartType type,
       {bool voidContext: false}) {
     return internalError("");
   }
 
-  Expression buildCompoundAssignment(Name binaryOperator, Expression value,
+  Expression buildCompoundAssignment(
+      Name binaryOperator, Expression value, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("");
   }
 
-  Expression buildPrefixIncrement(Name binaryOperator,
+  Expression buildPrefixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("");
   }
 
-  Expression buildPostfixIncrement(Name binaryOperator,
+  Expression buildPostfixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("");
   }
 
   toString() => "ThisAccessor($charOffset${isSuper ? ', super' : ''})";
 }
 
 abstract class IncompleteSend extends BuilderAccessor {
   final BuilderHelper helper;
 
@@ skipping 78 matching lines @@
           isNullAware: isNullAware);
     }
     return result..fileOffset = charOffset;
   }
 
   Expression buildNullAwareAssignment(Expression value, DartType type,
       {bool voidContext: false}) {
     return internalError("");
   }
 
-  Expression buildCompoundAssignment(Name binaryOperator, Expression value,
+  Expression buildCompoundAssignment(
+      Name binaryOperator, Expression value, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("");
   }
 
-  Expression buildPrefixIncrement(Name binaryOperator,
+  Expression buildPrefixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("Unhandled");
   }
 
-  Expression buildPostfixIncrement(Name binaryOperator,
+  Expression buildPostfixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("Unhandled");
   }
 
   Expression doInvocation(int charOffset, Arguments arguments) {
     return internalError("Unhandled");
   }
 
   toString() => "SendAccessor($charOffset, $name, $arguments)";
 }
@@ skipping 60 matching lines @@
     }
     return PropertyAccessor.make(helper, charOffset, helper.toValue(receiver),
         name, null, null, isNullAware);
   }
 
   Expression buildNullAwareAssignment(Expression value, DartType type,
       {bool voidContext: false}) {
     return internalError("Unhandled");
   }
 
-  Expression buildCompoundAssignment(Name binaryOperator, Expression value,
+  Expression buildCompoundAssignment(
+      Name binaryOperator, Expression value, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("Unhandled");
   }
 
-  Expression buildPrefixIncrement(Name binaryOperator,
+  Expression buildPrefixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("Unhandled");
   }
 
-  Expression buildPostfixIncrement(Name binaryOperator,
+  Expression buildPostfixIncrement(Name binaryOperator, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
     return internalError("Unhandled");
   }
 
   Expression doInvocation(int charOffset, Arguments arguments) {
     return internalError("Unhandled");
   }
 
   toString() => "IncompletePropertyAccessor($charOffset, $name)";
 }
 
 class IndexAccessor extends kernel.IndexAccessor with BuilderAccessor {
   final BuilderHelper helper;
 
-  final int charOffset;
-
-  IndexAccessor.internal(this.helper, this.charOffset, Expression receiver,
+  IndexAccessor.internal(this.helper, int charOffset, Expression receiver,
       Expression index, Procedure getter, Procedure setter)
-      : super.internal(receiver, index, getter, setter);
+      : super.internal(receiver, index, getter, setter, charOffset);
 
   String get plainNameForRead => "[]";
 
   String get plainNameForWrite => "[]=";
 
   Expression doInvocation(int charOffset, Arguments arguments) {
     return buildMethodInvocation(
         buildSimpleRead(), new Name("call"), arguments, charOffset);
   }
 
@@ skipping 196 matching lines @@
 class VariableAccessor extends kernel.VariableAccessor with BuilderAccessor {
   final BuilderHelper helper;
 
   VariableAccessor(this.helper, int charOffset, VariableDeclaration variable,
       [DartType promotedType])
       : super.internal(variable, charOffset, promotedType);
 
   String get plainNameForRead => variable.name;
 
   Expression doInvocation(int charOffset, Arguments arguments) {
-    return buildMethodInvocation(
-        buildSimpleRead(), new Name("call"), arguments, charOffset);
+    // Normally the offset is at the start of the token, but in this case,
+    // because we insert a '.call', we want it at the end instead.
+    return buildMethodInvocation(buildSimpleRead(), new Name("call"), arguments,
+        charOffset + variable.name.length);

[ahe, 2017/03/09 12:19:37]

variable.name might be null.

[jensj, 2017/03/09 12:55:25]

Fixed.

   }
 
   toString() => "VariableAccessor()";
 }
 
 Expression throwNoSuchMethodError(String name, Arguments arguments, Uri uri,
     int charOffset, CoreTypes coreTypes,
     {bool isSuper: false, isGetter: false, isSetter: false}) {
   printUnexpected(uri, charOffset, "Method not found: '$name'.");
   Constructor constructor =
@@ skipping 26 matching lines @@
             buildIsNull(new VariableGet(variable)),
             new NullLiteral(),
             new MethodInvocation(new VariableGet(variable), name, arguments)
               ..fileOffset = charOffset,
             const DynamicType()));
   } else {
     return new MethodInvocation(receiver, name, arguments)
       ..fileOffset = charOffset;
   }
 }