Rename nameOffset2 to nameOffset

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

Author: fshcheglov

pkg/analysis_server/lib/src/cider/rename.dart

@@ -240,7 +240,7 @@ class CheckNameResponse {
         infos.add(
           ReplaceInfo(
             newName,
-            lineInfo.getLocation(getter.firstFragment.nameOffset2!),
+            lineInfo.getLocation(getter.firstFragment.nameOffset!),
             getter.name!.length,
           ),
         );
@@ -250,7 +250,7 @@ class CheckNameResponse {
         infos.add(
           ReplaceInfo(
             newName,
-            lineInfo.getLocation(setter.firstFragment.nameOffset2!),
+            lineInfo.getLocation(setter.firstFragment.nameOffset!),
             setter.name!.length,
           ),
         );
@@ -290,7 +290,7 @@ class CheckNameResponse {
     } else {
       var location = (await canRename._fileResolver.resolve(
         path: sourcePath,
-      )).lineInfo.getLocation(element.firstFragment.nameOffset2!);
+      )).lineInfo.getLocation(element.firstFragment.nameOffset!);
       infos.add(ReplaceInfo(newName, location, element.name!.length));
     }
     return infos;
@@ -305,7 +305,7 @@ class CheckNameResponse {
     var libraryFragment = firstFragment.libraryFragment;
     var sourcePath = libraryFragment.source.fullName;
     var location = libraryFragment.lineInfo.getLocation(
-      firstFragment.nameOffset2!,
+      firstFragment.nameOffset!,
     );
     CiderSearchMatch ciderMatch;
     var searchInfo = CiderSearchInfo(

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

@@ -135,7 +135,7 @@ class CallHierarchyItem {
     element = _nonSynthetic(element);
     var fragment = element.firstFragment as FragmentImpl;
 
-    var nameOffset = fragment.nameOffset2;
+    var nameOffset = fragment.nameOffset;
     var nameEnd = fragment.nameEnd;
     if (nameOffset != null && nameEnd != null) {
       return SourceRange(nameOffset, nameEnd - nameOffset);

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

@@ -208,7 +208,7 @@ class DartInlayHintComputer {
       return null;
     }
     var firstFragment = element.firstFragment;
-    var nameOffset = firstFragment.nameOffset2;
+    var nameOffset = firstFragment.nameOffset;
     var libraryFragment = firstFragment.libraryFragment;
     var path = libraryFragment?.source.fullName;
     var lineInfo = libraryFragment?.lineInfo;

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

@@ -231,10 +231,10 @@ class TypeHierarchyItem {
 
     // Some non-synthetic items can still have invalid nameOffsets (for example
     // a compilation unit). This should never happen here, but guard against it.
-    assert(fragment.nameOffset2 != -1);
-    return fragment.nameOffset2 == -1
+    assert(fragment.nameOffset != -1);
+    return fragment.nameOffset == -1
         ? SourceRange(0, 0)
-        : SourceRange(fragment.nameOffset2 ?? 0, fragment.name?.length ?? 0);
+        : SourceRange(fragment.nameOffset ?? 0, fragment.name?.length ?? 0);
   }
 }
 

pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart

@@ -34,7 +34,7 @@ class ImplementedComputer {
 
   void _addImplementedClass(InterfaceElement element) {
     for (var fragment in element.fragments) {
-      var offset = fragment.nameOffset2;
+      var offset = fragment.nameOffset;
       var name = fragment.name;
       if (offset != null && name != null) {
         classes.add(protocol.ImplementedClass(offset, name.length));
@@ -44,7 +44,7 @@ class ImplementedComputer {
 
   void _addImplementedMember(Element element) {
     for (var fragment in element.fragments) {
-      var offset = fragment.nameOffset2;
+      var offset = fragment.nameOffset;
       var name = fragment.name;
       if (offset != null && name != null) {
         members.add(protocol.ImplementedMember(offset, name.length));

pkg/analysis_server/lib/src/lsp/handlers/code_lens/abstract_code_lens_provider.dart

@@ -33,7 +33,7 @@ abstract class AbstractCodeLensProvider
   /// If for any reason the location cannot be computed, returns `null`.
   Location? getLocation(Fragment fragment) {
     // We can't produce a location to a name if there isn't one.
-    var nameOffset = fragment.nameOffset2;
+    var nameOffset = fragment.nameOffset;
     var nameLength = fragment.element.displayName.length;
     if (nameOffset == null) {
       return null;

pkg/analysis_server/lib/src/lsp/handlers/code_lens/augmentations.dart

@@ -77,7 +77,7 @@ class AugmentationCodeLensProvider extends AbstractCodeLensProvider {
         title,
         targetFragment,
       );
-      var nameOffset = thisFragment.nameOffset2;
+      var nameOffset = thisFragment.nameOffset;
       var nameLength = thisFragment.element.displayName.length;
       if (command != null && nameOffset != null) {
         var range = toRange(result.lineInfo, nameOffset, nameLength);

pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart

@@ -106,7 +106,7 @@ class ImplementationHandler
                   return null;
                 }
 
-                var nameOffset = firstFragment.nameOffset2;
+                var nameOffset = firstFragment.nameOffset;
                 var name = firstFragment.name;
                 if (nameOffset == null || name == null) {
                   return null;

pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart

@@ -122,7 +122,7 @@ class TypeDefinitionHandler
           return success(_emptyResult);
         }
 
-        var nameOffset = targetFragment.nameOffset2;
+        var nameOffset = targetFragment.nameOffset;
         var nameLength = targetFragment.name?.length;
         if (nameOffset == null || nameLength == null) {
           return success(_emptyResult);

pkg/analysis_server/lib/src/lsp/mapping.dart

@@ -533,10 +533,10 @@ lsp.Location? fragmentToLocation(
     :var isSynthetic,
   ) when isSynthetic) {
     var element = fragment.element.nonSynthetic;
-    nameOffset = element.firstFragment.nameOffset2;
+    nameOffset = element.firstFragment.nameOffset;
     nameLength = element.firstFragment.name?.length;
   } else {
-    nameOffset = fragment.nameOffset2;
+    nameOffset = fragment.nameOffset;
     nameLength = fragment.name?.length;
   }