Deprecate Element.name3, use name instead.

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

Author: fshcheglov

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

@@ -86,7 +86,7 @@ class LibraryElementSuggestionBuilder
   @override
   void visitExtensionElement(ExtensionElement element) {
     if (opType.includeReturnValueSuggestions) {
-      if (element.name3 != null) {
+      if (element.name != null) {
         builder.suggestExtension(element, kind: kind, prefix: prefix);
       }
     }

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

@@ -76,7 +76,7 @@ class CanRenameResponse {
   ) {
     var parentClass = element.enclosingElement;
     // Check if the "newName" is the name of the enclosing class.
-    if (parentClass.name3 == newName) {
+    if (parentClass.name == newName) {
       result.addError(
         'The constructor should not have the same name '
         'as the name of the enclosing class.',
@@ -104,7 +104,7 @@ class CanRenameResponse {
       if (state != null) {
         var flutterWidgetStateNewName = '${newName}State';
         // If the State was private, ensure that it stays private.
-        if (state.name3!.startsWith('_') &&
+        if (state.name!.startsWith('_') &&
             !flutterWidgetStateNewName.startsWith('_')) {
           flutterWidgetStateNewName = '_$flutterWidgetStateNewName';
         }
@@ -241,7 +241,7 @@ class CheckNameResponse {
           ReplaceInfo(
             newName,
             lineInfo.getLocation(getter.firstFragment.nameOffset2!),
-            getter.name3!.length,
+            getter.name!.length,
           ),
         );
       }
@@ -251,7 +251,7 @@ class CheckNameResponse {
           ReplaceInfo(
             newName,
             lineInfo.getLocation(setter.firstFragment.nameOffset2!),
-            setter.name3!.length,
+            setter.name!.length,
           ),
         );
       }
@@ -291,7 +291,7 @@ class CheckNameResponse {
       var location = (await canRename._fileResolver.resolve(
         path: sourcePath,
       )).lineInfo.getLocation(element.firstFragment.nameOffset2!);
-      infos.add(ReplaceInfo(newName, location, element.name3!.length));
+      infos.add(ReplaceInfo(newName, location, element.name!.length));
     }
     return infos;
   }
@@ -310,7 +310,7 @@ class CheckNameResponse {
     CiderSearchMatch ciderMatch;
     var searchInfo = CiderSearchInfo(
       location,
-      stateClass.name3!.length,
+      stateClass.name!.length,
       MatchKind.DECLARATION,
     );
     try {
@@ -329,7 +329,7 @@ class CheckNameResponse {
                       (p) => ReplaceInfo(
                         stateName,
                         p.startPosition,
-                        stateClass.name3!.length,
+                        stateClass.name!.length,
                       ),
                     )
                     .toList(),
@@ -388,7 +388,7 @@ class CheckNameResponse {
       resolvedUnit: resolvedUnit,
       session: fileResolver.contextObjects!.analysisSession,
       (builder) => builder.writeConstructorDeclaration(
-        interfaceElement.name3!,
+        interfaceElement.name!,
         constructorName: newName,
         isConst: node is EnumDeclaration,
       ),

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

@@ -78,7 +78,7 @@ class ColorComputer {
     var constructor = expression.constructorName;
     var staticElement = constructor.element;
     var classElement = staticElement?.enclosingElement;
-    var className = classElement?.name3;
+    var className = classElement?.name;
     var constructorName = constructor.name?.name;
     var constructorArgs = expression.argumentList.arguments.toList();
 
@@ -228,7 +228,7 @@ class ColorComputer {
   }
 
   /// Checks whether this elements library is dart:ui.
-  bool _isDartUi(Element? element) => element?.library?.name3 == 'dart.ui';
+  bool _isDartUi(Element? element) => element?.library?.name == 'dart.ui';
 
   /// Checks whether this elements library is Flutter Material colors.
   bool _isFlutterMaterial(Element? element) =>

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

@@ -46,7 +46,7 @@ class DartInlayHintComputer {
     SyntacticEntity nodeOrToken,
     FormalParameterElement parameter,
   ) {
-    var name = parameter.name3;
+    var name = parameter.name;
     if (name == null || name.isEmpty) {
       return;
     }
@@ -186,7 +186,7 @@ class DartInlayHintComputer {
         InlayHintLabelPart(
           // Write type without type args or nullability suffix. Type args need
           // adding as their own parts, and the nullability suffix does after them.
-          value: type.element?.name3 ?? type.getDisplayString(),
+          value: type.element?.name ?? type.getDisplayString(),
           location: _locationForElement(type.element),
         ),
       );

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

@@ -539,7 +539,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
       return true;
     }
     return element is engine.TopLevelFunctionElement &&
-        element.name3 == 'group' &&
+        element.name == 'group' &&
         _isInsideTestPackage(element);
   }
 
@@ -550,7 +550,7 @@ class _FunctionBodyOutlinesVisitor extends RecursiveAstVisitor<void> {
       return true;
     }
     return element is engine.TopLevelFunctionElement &&
-        element.name3 == 'test' &&
+        element.name == 'test' &&
         _isInsideTestPackage(element);
   }
 

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

@@ -220,7 +220,7 @@ class _OverriddenElementsFinder {
         if (!identical(element.library, _library) && _name.startsWith('_')) {
           return false;
         }
-        return element.name3 == _name;
+        return element.name == _name;
       });
     }
 

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

@@ -71,7 +71,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
   void visitNamedType(NamedType node) {
     if (node.offset <= endOffset && node.end >= startOffset) {
       var importPrefix = node.importPrefix;
-      var prefix = importPrefix?.element?.name3 ?? '';
+      var prefix = importPrefix?.element?.name ?? '';
       _addElement(prefix, node.element);
     }
 
@@ -130,7 +130,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
       () => ImportedElements(path, prefix, <String>[]),
     );
     var elementNames = elements.elements;
-    var elementName = element.name3;
+    var elementName = element.name;
     if (elementName != null && !elementNames.contains(elementName)) {
       elementNames.add(elementName);
     }
@@ -140,7 +140,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
     if (identifier.offset <= endOffset && identifier.end >= startOffset) {
       var prefixElement = identifier.element;
       if (prefixElement is PrefixElement) {
-        return prefixElement.name3 ?? '';
+        return prefixElement.name ?? '';
       }
     }
     return '';

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

@@ -22,7 +22,7 @@ void addDartOccurrences(OccurrencesCollector collector, CompilationUnit unit) {
     // because 'name3' may contain 'new' for constructors which doesn't match
     // what is in the source.
     var length =
-        serverElement.location?.length ?? engineElement.name3?.length ?? 0;
+        serverElement.location?.length ?? engineElement.name?.length ?? 0;
     var offsets =
         offsetLengths
             .where((offsetLength) => offsetLength.$2 == length)

pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/editable_arguments_mixin.dart

@@ -164,8 +164,8 @@ mixin EditableArgumentsMixin {
 
   /// Returns the name of an enum constant prefixed with the enum name.
   static String? getQualifiedEnumConstantName(FieldElement enumConstant) {
-    var enumName = enumConstant.enclosingElement.name3;
-    var name = enumConstant.name3;
+    var enumName = enumConstant.enclosingElement.name;
+    var name = enumConstant.name;
     return enumName != null && name != null ? '$enumName.$name' : null;
   }
 }

pkg/analysis_server/lib/src/lsp/handlers/custom/editable_arguments/handler_edit_argument.dart

@@ -106,12 +106,12 @@ class EditArgumentHandler extends SharedMessageHandler<EditArgumentParams, Null>
       // Find the parameter we're editing the argument for.
       var parameterName = params.edit.name;
       var parameter = parameters.firstWhereOrNull(
-        (p) => p.name3 == parameterName,
+        (p) => p.name == parameterName,
       );
       if (parameter == null) {
         return error(
           ServerErrorCodes.EditArgumentInvalidParameter,
-          "The parameter '$parameterName' was not found in this invocation. The available parameters are ${parameters.map((p) => p.name3).join(', ')}",
+          "The parameter '$parameterName' was not found in this invocation. The available parameters are ${parameters.map((p) => p.name).join(', ')}",
         );
       }
 
@@ -392,7 +392,7 @@ class EditArgumentHandler extends SharedMessageHandler<EditArgumentParams, Null>
       }
     }
 
-    var parameterName = parameter.name3;
+    var parameterName = parameter.name;
     var argumentNamePrefix =
         parameter.isNamed && parameterName != null ? '$parameterName: ' : '';
     var argumentCode = '$argumentNamePrefix$newValueCode';