Elements. Use FragmentImpl.nameEnd instead of nameLength.

Change-Id: If02b26cd8e1346aa34c8978dc286499975905a95
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/439547
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart

@@ -135,11 +135,22 @@ class CallHierarchyItem {
     element = _nonSynthetic(element);
     var fragment = element.firstFragment as FragmentImpl;
 
-    // Compilation units will return -1 for nameOffset which is not valid, so
-    // use 0:0.
-    return fragment.nameOffset == -1
-        ? SourceRange(0, 0)
-        : SourceRange(fragment.nameOffset, fragment.nameLength);
+    var nameOffset = fragment.nameOffset2;
+    var nameEnd = fragment.nameEnd;
+    if (nameOffset != null && nameEnd != null) {
+      return SourceRange(nameOffset, nameEnd - nameOffset);
+    }
+
+    // For unnamed constructors, use the type name.
+    if (fragment is ConstructorFragmentImpl) {
+      var typeNameOffset = fragment.typeNameOffset;
+      var typeName = fragment.typeName;
+      if (typeName != null && typeNameOffset != null) {
+        return SourceRange(typeNameOffset, typeName.length);
+      }
+    }
+
+    return SourceRange(0, 0);
   }
 
   static Element _nonSynthetic(Element element) {

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

@@ -959,6 +959,7 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
   @override
   int? periodOffset;
 
+  @override
   int? nameEnd;
 
   @override
@@ -1064,16 +1065,6 @@ class ConstructorFragmentImpl extends ExecutableFragmentImpl
   @override
   String get name2 => name;
 
-  @override
-  int get nameLength {
-    var nameEnd = this.nameEnd;
-    if (nameEnd == null) {
-      return 0;
-    } else {
-      return nameEnd - nameOffset;
-    }
-  }
-
   @override
   int get offset => isSynthetic ? enclosingElement.offset : nameOffset;
 
@@ -3008,10 +2999,7 @@ class FormalParameterElementImpl extends PromotableElementImpl
     TypeImpl type,
     ParameterKind parameterKind,
   ) {
-    var fragment = FormalParameterFragmentImpl.synthetic(
-      name,
-      parameterKind,
-    );
+    var fragment = FormalParameterFragmentImpl.synthetic(name, parameterKind);
     return FormalParameterElementImpl(fragment)..type = type;
   }
 
@@ -3754,9 +3742,16 @@ abstract class FragmentImpl implements Fragment {
   @override
   String? get name2 => name;
 
-  /// The length of the name of this element in the file that contains the
-  /// declaration of this element, or `0` if this element does not have a name.
-  int get nameLength => displayName.length;
+  /// The offset after the last character of the name, or `null` if there is
+  /// no declaration in code for this fragment, or the name is absent.
+  int? get nameEnd {
+    if (nameOffset2 case var nameOffset?) {
+      if (name case var name?) {
+        return nameOffset + name.length;
+      }
+    }
+    return null;
+  }
 
   /// The analysis session in which this element is defined.
   AnalysisSession? get session {

pkg/analyzer/lib/src/dart/micro/utils.dart

@@ -348,18 +348,14 @@ class ReferencesCollector extends GeneralizingAstVisitor<void> {
   visitConstructorDeclaration(covariant ConstructorDeclarationImpl node) {
     var fragment = node.declaredFragment;
     if (fragment?.element == element) {
-      if (fragment!.name == 'new') {
+      if ((node.period, node.name) case (var period?, var nameToken?)) {
+        var offset = period.offset;
+        var length = nameToken.end - offset;
+        references.add(MatchInfo(offset, length, MatchKind.DECLARATION));
+      } else {
         references.add(
-          MatchInfo(
-            fragment.nameOffset + fragment.nameLength,
-            0,
-            MatchKind.DECLARATION,
-          ),
+          MatchInfo(node.returnType.end, 0, MatchKind.DECLARATION),
         );
-      } else {
-        var offset = node.period!.offset;
-        var length = node.name!.end - offset;
-        references.add(MatchInfo(offset, length, MatchKind.DECLARATION));
       }
     }
     super.visitConstructorDeclaration(node);