More improvements to DeclarationResolver.

pkg/analyzer/lib/src/dart/element/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.
 
 library analyzer.src.dart.element.element;
 
 import 'dart:collection';
 import 'dart:math' show min;
 
 import 'package:analyzer/dart/ast/ast.dart';
@@ skipping 852 matching lines @@
   @override
   String get name {
     if (_unlinkedClass != null) {
       return _unlinkedClass.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedClass != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedClass != null) {
       return _unlinkedClass.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   InterfaceType get supertype {
     if (_unlinkedClass != null && _supertype == null) {
       if (_unlinkedClass.supertype != null) {
         DartType type = enclosingUnit.resynthesizerContext
             .resolveTypeRef(_unlinkedClass.supertype, this);
         if (type is InterfaceType) {
           _supertype = type;
@@ skipping 957 matching lines @@
   @override
   String get name {
     if (_unlinkedEnumValue != null) {
       return _unlinkedEnumValue.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedEnumValue != null) {
+    int offset = super.nameOffset;
+    if (offset == -1 && _unlinkedEnumValue != null) {
       return _unlinkedEnumValue.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   InterfaceType get type => _enum.type;
 }
 
 /**
  * The synthetic `values` field of an enum.
  */
 class ConstFieldElementImpl_EnumValues extends ConstFieldElementImpl_ofEnum {
@@ skipping 1602 matching lines @@
   @override
   String get name {
     if (_unlinkedEnum != null) {
       return _unlinkedEnum.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedEnum != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedEnum != null && _unlinkedEnum.nameOffset != 0) {
       return _unlinkedEnum.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   InterfaceType get supertype => context.typeProvider.objectType;
 
   @override
   InterfaceType get type {
     if (_type == null) {
       InterfaceTypeImpl type = new InterfaceTypeImpl(this);
       type.typeArguments = const <DartType>[];
@@ skipping 325 matching lines @@
   @override
   String get name {
     if (serializedExecutable != null) {
       return serializedExecutable.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (serializedExecutable != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && serializedExecutable != null) {
       return serializedExecutable.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   List<ParameterElement> get parameters {
     if (serializedExecutable != null) {
       _parameters ??= ParameterElementImpl.resynthesizeList(
           serializedExecutable.parameters, this);
     }
     return _parameters ?? const <ParameterElement>[];
   }
@@ skipping 253 matching lines @@
     return super.metadata;
   }
 
   void set metadata(List<ElementAnnotation> metadata) {
     assert(_unlinkedExportNonPublic == null);
     super.metadata = metadata;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedExportNonPublic != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedExportNonPublic != null) {
       return _unlinkedExportNonPublic.offset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   String get uri {
     if (_unlinkedExportPublic != null) {
       return _selectedUri ??= _selectUri(
           _unlinkedExportPublic.uri, _unlinkedExportPublic.configurations);
     }
     return super.uri;
   }
@@ skipping 549 matching lines @@
   @override
   String get name {
     if (_unlinkedTypedef != null) {
       return _unlinkedTypedef.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedTypedef != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedTypedef != null) {
       return _unlinkedTypedef.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   List<ParameterElement> get parameters {
     if (_unlinkedTypedef != null) {
       _parameters ??= ParameterElementImpl.resynthesizeList(
           _unlinkedTypedef.parameters, this);
     }
     return _parameters ?? const <ParameterElement>[];
   }
@@ skipping 313 matching lines @@
     return super.metadata;
   }
 
   void set metadata(List<ElementAnnotation> metadata) {
     assert(_unlinkedImport == null);
     super.metadata = metadata;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedImport != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedImport != null) {
       if (_unlinkedImport.isImplicit) {
         return -1;
       }
       return _unlinkedImport.offset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   PrefixElement get prefix {
     if (_unlinkedImport != null) {
       if (_unlinkedImport.prefixReference != 0 && _prefix == null) {
         LibraryElementImpl library = enclosingElement as LibraryElementImpl;
         _prefix = new PrefixElementImpl.forSerialized(_unlinkedImport, library);
       }
     }
     return _prefix;
@@ skipping 182 matching lines @@
   @override
   String get name {
     if (_unlinkedLabel != null) {
       return _unlinkedLabel.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedLabel != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 &&
+        _unlinkedLabel != null &&
+        _unlinkedLabel.nameOffset != 0) {
       return _unlinkedLabel.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   accept(ElementVisitor visitor) => visitor.visitLabelElement(this);
 
   /**
    * Create and return [LabelElement]s for the given [unlinkedLabels].
    */
   static List<LabelElement> resynthesizeList(
       ExecutableElementImpl enclosingExecutable,
@@ skipping 1517 matching lines @@
   @override
   String get name {
     if (_unlinkedVariable != null) {
       return _unlinkedVariable.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedVariable != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedVariable != null) {
       return _unlinkedVariable.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   DartType get type {
     if (_unlinkedVariable != null && _type == null) {
       _type = enclosingUnit.resynthesizerContext.resolveLinkedType(
               _unlinkedVariable.inferredTypeSlot, typeParameterContext) ??
           enclosingUnit.resynthesizerContext
               .resolveTypeRef(_unlinkedVariable.type, typeParameterContext);
     }
@@ skipping 280 matching lines @@
   @override
   String get name {
     if (_unlinkedParam != null) {
       return _unlinkedParam.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedParam != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedParam != null) {
       if (isSynthetic) {
         return -1;
       }
       return _unlinkedParam.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   ParameterKind get parameterKind {
     if (_unlinkedParam != null && _parameterKind == null) {
       switch (_unlinkedParam.kind) {
         case UnlinkedParamKind.named:
           _parameterKind = ParameterKind.NAMED;
           break;
         case UnlinkedParamKind.positional:
@@ skipping 295 matching lines @@
         LibraryElementImpl library = enclosingElement as LibraryElementImpl;
         int prefixId = _unlinkedImport.prefixReference;
         return _name = library._unlinkedDefiningUnit.references[prefixId].name;
       }
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedImport != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedImport != null) {
       return _unlinkedImport.prefixOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   @override
   accept(ElementVisitor visitor) => visitor.visitPrefixElement(this);
 
   @override
   void appendTo(StringBuffer buffer) {
     buffer.write("as ");
     super.appendTo(buffer);
   }
@@ skipping 624 matching lines @@
   @override
   String get name {
     if (_unlinkedTypeParam != null) {
       return _unlinkedTypeParam.name;
     }
     return super.name;
   }
 
   @override
   int get nameOffset {
-    if (_unlinkedTypeParam != null) {
+    int offset = super.nameOffset;
+    if (offset == 0 && _unlinkedTypeParam != null) {
       return _unlinkedTypeParam.nameOffset;
     }
-    return super.nameOffset;
+    return offset;
   }
 
   TypeParameterType get type {
     if (_unlinkedTypeParam != null) {
       _type ??= new TypeParameterTypeImpl(this);
     }
     return _type;
   }
 
   void set type(TypeParameterType type) {
@@ skipping 398 matching lines @@
 
   @override
   void visitElement(Element element) {
     int offset = element.nameOffset;
     if (offset != -1) {
       map[offset] = element;
     }
     super.visitElement(element);
   }
 }