Use Element.nameLength where possible.

scheglov · scheglov · commit 6bab7d9cbc74 · 2015-09-25T15:03:46.000-07:00
...or don't use it when there is a better alternative. R=brianwilkerson@google.com BUG= Review URL: https://codereview.chromium.org//1372673003 .
diff --git a/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart
@@ -33,21 +33,15 @@ class ImplementedComputer {
   }
 
   void _addImplementedClass(ClassElement type) {
-    String name = type.name;
-    if (name != null) {
-      int offset = type.nameOffset;
-      int length = name.length;
-      classes.add(new protocol.ImplementedClass(offset, length));
-    }
+    int offset = type.nameOffset;
+    int length = type.nameLength;
+    classes.add(new protocol.ImplementedClass(offset, length));
   }
 
   void _addImplementedMember(Element member) {
-    String name = member.displayName;
-    if (name != null) {
-      int offset = member.nameOffset;
-      int length = name.length;
-      members.add(new protocol.ImplementedMember(offset, length));
-    }
+    int offset = member.nameOffset;
+    int length = member.nameLength;
+    members.add(new protocol.ImplementedMember(offset, length));
   }
 
   void _addMemberIfImplemented(Element element) {
diff --git a/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/occurrences_dart.dart
@@ -27,7 +27,7 @@ class DartOccurrencesComputer implements OccurrencesContributor {
             new _DartUnitOccurrencesComputerVisitor();
         unit.accept(visitor);
         visitor.elementsOffsets.forEach((engineElement, offsets) {
-          int length = engineElement.displayName.length;
+          int length = engineElement.nameLength;
           protocol.Element serverElement =
               protocol.newElement_fromEngine(engineElement);
           protocol.Occurrences occurrences =
diff --git a/pkg/analysis_server/lib/src/protocol_server.dart b/pkg/analysis_server/lib/src/protocol_server.dart
@@ -213,9 +213,8 @@ Location newLocation_fromElement(engine.Element element) {
   if (context == null || source == null) {
     return null;
   }
-  String name = element.displayName;
   int offset = element.nameOffset;
-  int length = name != null ? name.length : 0;
+  int length = element.nameLength;
   if (element is engine.CompilationUnitElement) {
     offset = 0;
     length = 0;
diff --git a/pkg/analysis_server/lib/src/search/element_references.dart b/pkg/analysis_server/lib/src/search/element_references.dart
@@ -90,7 +90,7 @@ class ElementReferencesComputer {
 
   SearchResult _newDeclarationResult(Element refElement) {
     int nameOffset = refElement.nameOffset;
-    int nameLength = refElement.name.length;
+    int nameLength = refElement.nameLength;
     SearchMatch searchMatch = new SearchMatch(MatchKind.DECLARATION, refElement,
         new SourceRange(nameOffset, nameLength), true, false);
     return newSearchResult_fromMatch(searchMatch);
diff --git a/pkg/analysis_server/lib/src/services/index/index_contributor.dart b/pkg/analysis_server/lib/src/services/index/index_contributor.dart
@@ -649,7 +649,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
 
   void _recordHasAncestor(ClassElement element) {
     int offset = element.nameOffset;
-    int length = element.name.length;
+    int length = element.nameLength;
     LocationImpl location = _createLocationForOffset(offset, length);
     _recordHasAncestor0(location, element, false, <ClassElement>[]);
   }
diff --git a/pkg/analysis_server/lib/src/services/index/indexable_element.dart b/pkg/analysis_server/lib/src/services/index/indexable_element.dart
@@ -36,7 +36,7 @@ class IndexableElement implements IndexableObject {
   IndexableObjectKind get kind => IndexableElementKind.forElement(element);
 
   @override
-  int get length => element.displayName.length;
+  int get length => element.nameLength;
 
   @override
   String get name => element.displayName;
diff --git a/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart b/pkg/analysis_server/lib/src/services/refactoring/rename_import.dart
@@ -54,7 +54,7 @@ class RenameImportRefactoringImpl extends RenameRefactoringImpl {
       SourceEdit edit = null;
       if (newName.isEmpty) {
         int uriEnd = element.uriEnd;
-        int prefixEnd = element.prefixOffset + prefix.displayName.length;
+        int prefixEnd = element.prefixOffset + prefix.nameLength;
         SourceRange range = rangeStartEnd(uriEnd, prefixEnd);
         edit = newSourceEdit_range(range, "");
       } else {
@@ -63,7 +63,7 @@ class RenameImportRefactoringImpl extends RenameRefactoringImpl {
           edit = newSourceEdit_range(range, " as ${newName}");
         } else {
           int offset = element.prefixOffset;
-          int length = prefix.displayName.length;
+          int length = prefix.nameLength;
           SourceRange range = rangeStartLength(offset, length);
           edit = newSourceEdit_range(range, newName);
         }
diff --git a/pkg/analysis_server/test/services/index/dart_index_contributor_test.dart b/pkg/analysis_server/test/services/index/dart_index_contributor_test.dart
@@ -1580,7 +1580,7 @@ main(A a, p) {
 
   void _assertDefinesTopLevelElement(Element element) {
     ExpectedLocation location = new ExpectedLocation(
-        element, element.nameOffset, element.name.length, false, true);
+        element, element.nameOffset, element.nameLength, false, true);
     _assertRecordedRelationForElement(
         testLibraryElement, IndexConstants.DEFINES, location);
     expect(recordedTopElements, contains(element));
diff --git a/pkg/analyzer/lib/src/generated/element.dart b/pkg/analyzer/lib/src/generated/element.dart
@@ -8466,7 +8466,7 @@ class MultiplyDefinedElementImpl implements MultiplyDefinedElement {
   String get name => _name;
 
   @override
-  int get nameLength => name != null ? name.length : 0;
+  int get nameLength => displayName != null ? displayName.length : 0;
 
   @override
   int get nameOffset => -1;
diff --git a/pkg/analyzer/lib/src/generated/error.dart b/pkg/analyzer/lib/src/generated/error.dart
@@ -2569,16 +2569,15 @@ class ErrorReporter {
    * Report an error with the given [errorCode] and [arguments]. The [element]
    * is used to compute the location of the error.
    */
-  void reportErrorForElement(
-      ErrorCode errorCode, Element element, List<Object> arguments) {
-    String displayName = element.displayName;
+  void reportErrorForElement(ErrorCode errorCode, Element element,
+      [List<Object> arguments]) {
     int length = 0;
-    if (displayName != null) {
-      length = displayName.length;
-    } else if (element is ImportElement) {
+    if (element is ImportElement) {
       length = 6; // 'import'.length
     } else if (element is ExportElement) {
       length = 6; // 'export'.length
+    } else {
+      length = element.nameLength;
     }
     reportErrorForOffset(errorCode, element.nameOffset, length, arguments);
   }
diff --git a/pkg/analyzer/lib/src/generated/error_verifier.dart b/pkg/analyzer/lib/src/generated/error_verifier.dart
@@ -2253,10 +2253,8 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       }
       // report problem
       hasProblem = true;
-      _errorReporter.reportErrorForOffset(
-          CompileTimeErrorCode.CONFLICTING_GETTER_AND_METHOD,
-          method.nameOffset,
-          name.length, [
+      _errorReporter.reportErrorForElement(
+          CompileTimeErrorCode.CONFLICTING_GETTER_AND_METHOD, method, [
         _enclosingClass.displayName,
         inherited.enclosingElement.displayName,
         name
@@ -2276,10 +2274,8 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       }
       // report problem
       hasProblem = true;
-      _errorReporter.reportErrorForOffset(
-          CompileTimeErrorCode.CONFLICTING_METHOD_AND_GETTER,
-          accessor.nameOffset,
-          name.length, [
+      _errorReporter.reportErrorForElement(
+          CompileTimeErrorCode.CONFLICTING_METHOD_AND_GETTER, accessor, [
         _enclosingClass.displayName,
         inherited.enclosingElement.displayName,
         name
@@ -2559,21 +2555,19 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       String name = typeParameter.name;
       // name is same as the name of the enclosing class
       if (_enclosingClass.name == name) {
-        _errorReporter.reportErrorForOffset(
+        _errorReporter.reportErrorForElement(
             CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_CLASS,
-            typeParameter.nameOffset,
-            name.length,
+            typeParameter,
             [name]);
         problemReported = true;
       }
       // check members
       if (_enclosingClass.getMethod(name) != null ||
           _enclosingClass.getGetter(name) != null ||
           _enclosingClass.getSetter(name) != null) {
-        _errorReporter.reportErrorForOffset(
+        _errorReporter.reportErrorForElement(
             CompileTimeErrorCode.CONFLICTING_TYPE_VARIABLE_AND_MEMBER,
-            typeParameter.nameOffset,
-            name.length,
+            typeParameter,
             [name]);
         problemReported = true;
       }
@@ -3008,10 +3002,9 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       displayName = enclosingElement.getExtendedDisplayName(null);
     }
     // report problem
-    _errorReporter.reportErrorForOffset(
+    _errorReporter.reportErrorForElement(
         CompileTimeErrorCode.DUPLICATE_DEFINITION_INHERITANCE,
-        staticMember.nameOffset,
-        name.length,
+        staticMember,
         [name, displayName]);
     return true;
   }
@@ -4026,10 +4019,8 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
     // check accessors
     for (PropertyAccessorElement accessor in _enclosingClass.accessors) {
       if (className == accessor.name) {
-        _errorReporter.reportErrorForOffset(
-            CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME,
-            accessor.nameOffset,
-            className.length);
+        _errorReporter.reportErrorForElement(
+            CompileTimeErrorCode.MEMBER_WITH_CLASS_NAME, accessor);
         problemReported = true;
       }
     }
@@ -5965,21 +5956,17 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
           buffer.write(separator);
         }
         buffer.write(element.displayName);
-        _errorReporter.reportErrorForOffset(
+        _errorReporter.reportErrorForElement(
             CompileTimeErrorCode.RECURSIVE_INTERFACE_INHERITANCE,
-            _enclosingClass.nameOffset,
-            enclosingClassName.length,
+            _enclosingClass,
             [enclosingClassName, buffer.toString()]);
         return true;
       } else {
         // RECURSIVE_INTERFACE_INHERITANCE_BASE_CASE_EXTENDS or
         // RECURSIVE_INTERFACE_INHERITANCE_BASE_CASE_IMPLEMENTS or
         // RECURSIVE_INTERFACE_INHERITANCE_BASE_CASE_WITH
-        _errorReporter.reportErrorForOffset(
-            _getBaseCaseErrorCode(element),
-            _enclosingClass.nameOffset,
-            enclosingClassName.length,
-            [enclosingClassName]);
+        _errorReporter.reportErrorForElement(_getBaseCaseErrorCode(element),
+            _enclosingClass, [enclosingClassName]);
         return true;
       }
     }
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -763,14 +763,14 @@ class ClassScope extends EnclosedScope {
         return new AnalysisError(
             duplicate.source,
             duplicate.nameOffset,
-            duplicate.displayName.length,
+            duplicate.nameLength,
             CompileTimeErrorCode.METHOD_AND_GETTER_WITH_SAME_NAME,
             [existing.displayName]);
       } else {
         return new AnalysisError(
             existing.source,
             existing.nameOffset,
-            existing.displayName.length,
+            existing.nameLength,
             CompileTimeErrorCode.GETTER_AND_METHOD_WITH_SAME_NAME,
             [existing.displayName]);
       }
@@ -6355,7 +6355,7 @@ class InheritanceManager {
                 _reportError(
                     classElt,
                     classElt.nameOffset,
-                    classElt.displayName.length,
+                    classElt.nameLength,
                     StaticTypeWarningCode.INCONSISTENT_METHOD_INHERITANCE,
                     [key, firstTwoFuntionTypesStr]);
               }
@@ -6384,7 +6384,7 @@ class InheritanceManager {
           _reportError(
               classElt,
               classElt.nameOffset,
-              classElt.displayName.length,
+              classElt.nameLength,
               StaticWarningCode.INCONSISTENT_METHOD_INHERITANCE_GETTER_AND_METHOD,
               [key]);
         }
@@ -8999,7 +8999,7 @@ class LibraryScope extends EnclosedScope {
       return new AnalysisError(
           duplicate.source,
           offset,
-          duplicate.displayName.length,
+          duplicate.nameLength,
           CompileTimeErrorCode.PREFIX_COLLIDES_WITH_TOP_LEVEL_MEMBER,
           [existing.displayName]);
     }
@@ -11943,12 +11943,8 @@ abstract class Scope {
     // TODO(jwren) There are 4 error codes for duplicate, but only 1 is being
     // generated.
     Source source = duplicate.source;
-    return new AnalysisError(
-        source,
-        duplicate.nameOffset,
-        duplicate.displayName.length,
-        CompileTimeErrorCode.DUPLICATE_DEFINITION,
-        [existing.displayName]);
+    return new AnalysisError(source, duplicate.nameOffset, duplicate.nameLength,
+        CompileTimeErrorCode.DUPLICATE_DEFINITION, [existing.displayName]);
   }
 
   /**
@@ -15155,7 +15151,7 @@ class StrongTypeSystemImpl implements TypeSystem {
   }
 
   /**
-   * Check that [f1] is a subtype of [f2]. 
+   * Check that [f1] is a subtype of [f2].
    * [fuzzyArrows] indicates whether or not the f1 and f2 should be
    * treated as fuzzy arrow types (and hence dynamic parameters to f2 treated
    * as bottom).
@@ -15534,12 +15530,8 @@ class UnusedLocalElementsVerifier extends RecursiveElementVisitor {
   void _reportErrorForElement(
       ErrorCode errorCode, Element element, List<Object> arguments) {
     if (element != null) {
-      _errorListener.onError(new AnalysisError(
-          element.source,
-          element.nameOffset,
-          element.displayName.length,
-          errorCode,
-          arguments));
+      _errorListener.onError(new AnalysisError(element.source,
+          element.nameOffset, element.nameLength, errorCode, arguments));
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ class _IndexContributor extends GeneralizingAstVisitor {`
`649`	`649`
`650`	`650`	`void _recordHasAncestor(ClassElement element) {`
`651`	`651`	`int offset = element.nameOffset;`
`652`		`- int length = element.name.length;`
	`652`	`+ int length = element.nameLength;`
`653`	`653`	`LocationImpl location = _createLocationForOffset(offset, length);`
`654`	`654`	`_recordHasAncestor0(location, element, false, <ClassElement>[]);`
`655`	`655`	`}`