[fasta] Add and correct even 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 335 matching lines @@
       if (builder == null) {
         return buildThrowNoSuchMethodError(arguments);
       }
       if (builder.hasProblem) {
         result = helper.buildProblemExpression(builder, name.name);
       } else {
         Member target = builder.target;
         if (target != null) {
           if (target is Field) {
             result = buildMethodInvocation(
-                new StaticGet(target), new Name("call"), arguments, charOffset,
+                new StaticGet(target),
+                new Name("call"),
+                arguments,
+                charOffset + (target.name?.name?.length ?? 0),
                 isNullAware: isNullAware);
           } else {
-            result = helper.buildStaticInvocation(target, arguments);
+            result = helper.buildStaticInvocation(target, arguments)
+              ..fileOffset = charOffset;
           }
         } else {
-          result = buildThrowNoSuchMethodError(arguments);
+          result = buildThrowNoSuchMethodError(arguments)
+            ..fileOffset = charOffset;
         }
       }
     } else {
       result = buildMethodInvocation(
           helper.toValue(receiver), name, arguments, charOffset,
           isNullAware: isNullAware);
     }
-    return result..fileOffset = charOffset;
+    return result;
   }
 
   Expression buildNullAwareAssignment(Expression value, DartType type,
       {bool voidContext: false}) {
     return internalError("Unhandled");
   }
 
   Expression buildCompoundAssignment(
       Name binaryOperator, Expression value, int charOffset,
       {bool voidContext: false, Procedure interfaceTarget}) {
@@ skipping 177 matching lines @@
               helper, charOffset, receiver, name, getter, setter, null)
           : new PropertyAccessor.internal(
               helper, charOffset, receiver, name, getter, setter);
     }
   }
 }
 
 class StaticAccessor extends kernel.StaticAccessor with BuilderAccessor {
   final BuilderHelper helper;
 
-  final int charOffset;
-
   StaticAccessor(
-      this.helper, this.charOffset, Member readTarget, Member writeTarget)
-      : super(readTarget, writeTarget) {
+      this.helper, int charOffset, Member readTarget, Member writeTarget)
+      : super(readTarget, writeTarget, charOffset) {
     assert(readTarget != null || writeTarget != null);
   }
 
   String get plainNameForRead => (readTarget ?? writeTarget).name.name;
 
   Expression doInvocation(int charOffset, Arguments arguments) {
     if (readTarget == null || isFieldOrGetter(readTarget)) {
-      return buildMethodInvocation(
-          buildSimpleRead(), new Name("call"), arguments, charOffset);
+      return buildMethodInvocation(buildSimpleRead(), new Name("call"),
+          arguments, charOffset + (readTarget?.name?.name?.length ?? 0));
     } else {
       return helper.buildStaticInvocation(readTarget, arguments)
         ..fileOffset = charOffset;
     }
   }
 
   toString() => "StaticAccessor()";
 }
 
 class SuperPropertyAccessor extends kernel.SuperPropertyAccessor
@@ skipping 61 matching lines @@
         buildSimpleRead(), new Name("call"), arguments, charOffset);
   }
 
   toString() => "SuperIndexAccessor()";
 }
 
 class ThisPropertyAccessor extends kernel.ThisPropertyAccessor
     with BuilderAccessor {
   final BuilderHelper helper;
 
-  final int charOffset;
-
   ThisPropertyAccessor(
-      this.helper, this.charOffset, Name name, Member getter, Member setter)
-      : super(name, getter, setter);
+      this.helper, int charOffset, Name name, Member getter, Member setter)
+      : super(name, getter, setter, charOffset);
 
   String get plainNameForRead => name.name;
 
   bool get isThisPropertyAccessor => true;
 
   Expression doInvocation(int charOffset, Arguments arguments) {
     Member interfaceTarget = getter;
     if (interfaceTarget is Field) {
       // TODO(ahe): In strong mode we should probably rewrite this to
       // `this.name.call(arguments)`.
@@ skipping 78 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;
   }
 }