Update 'nameOffset' for elements during incremental analysis.

pkg/analyzer/lib/src/generated/element.dart

 // Copyright (c) 2014, 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.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.element;
 
 import 'dart:collection';
@@ skipping 3433 matching lines @@
   int _modifiers = 0;
 
   /**
    * An array containing all of the metadata associated with this element.
    */
   List<ElementAnnotation> metadata = ElementAnnotationImpl.EMPTY_ARRAY;
 
   /**
    * A cached copy of the calculated hashCode for this element.
    */
-  int _cachedHashCode = 0;
+  int _cachedHashCode;
 
   /**
    * A cached copy of the calculated location for this element.
    */
   ElementLocation _cachedLocation;
 
   /**
    * Initialize a newly created element to have the given name.
    *
    * @param name the name of this element
@@ skipping 32 matching lines @@
    * @param element the enclosing element of this element
    */
   void set enclosingElement(Element element) {
     _enclosingElement = element as ElementImpl;
   }
 
   @override
   int get hashCode {
     // TODO: We might want to re-visit this optimization in the future.
     // We cache the hash code value as this is a very frequently called method.
-    if (_cachedHashCode == 0) {
+    if (_cachedHashCode == null) {
       int hashIdentifier = identifier.hashCode;
       Element enclosing = enclosingElement;
       if (enclosing != null) {
         _cachedHashCode = hashIdentifier + enclosing.hashCode;
       } else {
         _cachedHashCode = hashIdentifier;
       }
     }
     return _cachedHashCode;
   }
@@ skipping 5279 matching lines @@
       : super(name, nameOffset);
 
   /**
    * Initialize a newly created local variable element to have the given name.
    *
    * @param name the name of this element
    */
   LocalVariableElementImpl.forNode(Identifier name) : super.forNode(name);
 
   @override
-  String get identifier => "${super.identifier}@$nameOffset";
+  String get identifier {
+    int enclosingOffset =
+        enclosingElement != null ? enclosingElement.nameOffset : 0;
+    int delta = nameOffset - enclosingOffset;
+    return '${super.identifier}@$delta';
+  }
 
   @override
   bool get isPotentiallyMutatedInClosure =>
       hasModifier(Modifier.POTENTIALLY_MUTATED_IN_CONTEXT);
 
   @override
   bool get isPotentiallyMutatedInScope =>
       hasModifier(Modifier.POTENTIALLY_MUTATED_IN_SCOPE);
 
   @override
@@ skipping 2737 matching lines @@
     }
     return newTypes;
   }
 }
 
 class TypeImpl_TypePair {
   final DartType _firstType;
 
   final DartType _secondType;
 
-  int _cachedHashCode = 0;
+  int _cachedHashCode;
 
   TypeImpl_TypePair(this._firstType, this._secondType);
 
   @override
   int get hashCode {
-    if (_cachedHashCode == 0) {
+    if (_cachedHashCode == null) {
       int firstHashCode = 0;
       if (_firstType != null) {
         Element firstElement = _firstType.element;
         firstHashCode = firstElement == null ? 0 : firstElement.hashCode;
       }
       int secondHashCode = 0;
       if (_secondType != null) {
         Element secondElement = _secondType.element;
         secondHashCode = secondElement == null ? 0 : secondElement.hashCode;
       }
@@ skipping 906 matching lines @@
     // bottom <: void (as bottom is a subtype of all types).
     // void <: dynamic (as dynamic is a supertype of all types)
     return identical(type, this) || type.isDynamic;
   }
 
   @override
   VoidTypeImpl substitute2(List<DartType> argumentTypes,
       List<DartType> parameterTypes) =>
       this;
 }