Deprecate Fragment.name2, use name instead.

Change-Id: Ic0506f50e9dc752b7e8e28f4299426be47407d4f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/439081
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Paul Berry <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: fshcheglov

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

@@ -217,7 +217,7 @@ class DartInlayHintComputer {
     }
     return Location(
       uri: pathContext.toUri(path),
-      range: toRange(lineInfo, nameOffset, firstFragment.name2?.length ?? 0),
+      range: toRange(lineInfo, nameOffset, firstFragment.name?.length ?? 0),
     );
   }
 

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

@@ -234,7 +234,7 @@ class TypeHierarchyItem {
     assert(fragment.nameOffset2 != -1);
     return fragment.nameOffset2 == -1
         ? SourceRange(0, 0)
-        : SourceRange(fragment.nameOffset2 ?? 0, fragment.name2?.length ?? 0);
+        : SourceRange(fragment.nameOffset2 ?? 0, fragment.name?.length ?? 0);
   }
 }
 

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

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

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

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

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

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

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

@@ -534,10 +534,10 @@ lsp.Location? fragmentToLocation(
   ) when isSynthetic) {
     var element = fragment.element.nonSynthetic;
     nameOffset = element.firstFragment.nameOffset2;
-    nameLength = element.firstFragment.name2?.length;
+    nameLength = element.firstFragment.name?.length;
   } else {
     nameOffset = fragment.nameOffset2;
-    nameLength = fragment.name2?.length;
+    nameLength = fragment.name?.length;
   }
 
   // For unnamed constructors, use the type name as the target location.

pkg/analysis_server/lib/src/protocol_server.dart

@@ -267,9 +267,9 @@ Location? newLocation_fromElement(engine.Element? element) {
     // instead of using 0,0.
     engine.ConstructorFragment(:var typeNameOffset, :var typeName) =>
       fragment.nameOffset2 != null
-          ? (fragment.nameOffset2 ?? 0, fragment.name2.length)
+          ? (fragment.nameOffset2 ?? 0, fragment.name.length)
           : (typeNameOffset ?? 0, typeName?.length ?? 0),
-    _ => (fragment.nameOffset2 ?? 0, fragment.name2?.length ?? 0),
+    _ => (fragment.nameOffset2 ?? 0, fragment.name?.length ?? 0),
   };
   var range = engine.SourceRange(offset, length);
   return _locationForArgs2(fragment, range);
@@ -285,7 +285,7 @@ Location? newLocation_fromFragment(engine.Fragment? fragment) {
     return null;
   }
   var offset = fragment.nameOffset2 ?? 0;
-  var length = fragment.name2?.length ?? 0;
+  var length = fragment.name?.length ?? 0;
   var range = engine.SourceRange(offset, length);
   return _locationForArgs2(fragment, range);
 }

pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart

@@ -177,7 +177,7 @@ class SuggestionBuilder {
     var enclosingClass = constructor.enclosingElement.firstFragment;
 
     if (completion == null) {
-      var className = enclosingClass.name2;
+      var className = enclosingClass.name;
       if (className == null || className.isEmpty) {
         return;
       }

pkg/analysis_server/lib/src/services/correction/dart/replace_return_type.dart

@@ -99,7 +99,7 @@ class ReplaceReturnType extends ResolvedCorrectionProducer {
       return false;
     }
 
-    var methodName = method.declaredFragment!.name2;
+    var methodName = method.declaredFragment!.name;
     if (methodName == null) {
       return false;
     }

pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_parameter.dart

@@ -150,7 +150,7 @@ extension on MethodDeclaration {
     var parameters = this.parameters;
     if (parameters != null) {
       for (var parameter in parameters.parameters) {
-        if (parameter.declaredFragment?.name2 == name) {
+        if (parameter.declaredFragment?.name == name) {
           return parameter;
         }
       }