Deprecate NamedType.name2, use 'name' instead.

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

Author: scheglov

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

@@ -1441,11 +1441,11 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
 
     var type = node.type;
     if (type != null) {
-      var isDynamic = type is DynamicType && node.name2.lexeme == 'dynamic';
+      var isDynamic = type is DynamicType && node.name.lexeme == 'dynamic';
       var isNever = type is NeverType;
       if (isDynamic || isNever) {
         computer._addRegion_token(
-          node.name2,
+          node.name,
           isDynamic
               ? HighlightRegionType.TYPE_NAME_DYNAMIC
               : HighlightRegionType.CLASS,
@@ -1457,7 +1457,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
 
     computer._addIdentifierRegion(
       parent: node,
-      nameToken: node.name2,
+      nameToken: node.name,
       element: node.element2,
     );
 

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

@@ -190,7 +190,7 @@ class DartUnitHoverComputer {
       ExtensionDeclaration() => node.name,
       FormalParameter() => node.name,
       MethodDeclaration() => node.name,
-      NamedType() => node.name2,
+      NamedType() => node.name,
       ConstructorDeclaration() => node.name ?? node.returnType,
       DeclaredIdentifier() => node.name,
       VariableDeclaration() => node.name,

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

@@ -83,7 +83,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
     if (node.name == null) {
       var element = node.element;
       if (element != null) {
-        _addOccurrence(element, node.type.name2);
+        _addOccurrence(element, node.type.name);
       }
       return; // skip visitNamedType.
     }
@@ -205,7 +205,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
   void visitNamedType(NamedType node) {
     var element = node.element2;
     if (element != null) {
-      _addOccurrence(element, node.name2);
+      _addOccurrence(element, node.name);
     }
 
     super.visitNamedType(node);

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

@@ -57,7 +57,7 @@ mixin EditableArgumentsMixin {
 
     String? widgetName, widgetDocumentation;
     if (invocation is InstanceCreationExpression) {
-      widgetName = invocation.constructorName.type.name2.lexeme;
+      widgetName = invocation.constructorName.type.name.lexeme;
 
       if (invocation.constructorName.element case var element?) {
         widgetDocumentation = getDocumentation(result, element);

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

@@ -82,7 +82,7 @@ class TypeDefinitionHandler
         SyntacticEntity? originEntity;
         DartType? type;
         if (node is NamedType) {
-          originEntity = node.name2;
+          originEntity = node.name;
           var element = node.element2;
           if (element case analyzer.InterfaceElement element) {
             type = element.thisType;

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

@@ -80,7 +80,7 @@ class IdentifierHelper {
   /// Adds any suggestions for a variable with the given [type].
   void addVariable(TypeAnnotation? type) {
     if (type is NamedType) {
-      addSuggestionsFromTypeName(type.name2.lexeme);
+      addSuggestionsFromTypeName(type.name.lexeme);
     }
   }
 

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

@@ -1118,7 +1118,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     if (offset <= extendsKeyword.end) {
       keywordHelper.addKeyword(Keyword.EXTENDS);
     } else if (node.superclass.isFullySynthetic ||
-        node.superclass.name2.coversOffset(offset)) {
+        node.superclass.name.coversOffset(offset)) {
       collector.completionLocation = 'ExtendsClause_superclass';
       _forTypeAnnotation(node, mustBeExtensible: true);
     }
@@ -1401,7 +1401,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
           if (offset < variable.name.offset) {
             var type = variable.type;
             if (type == null ||
-                (type is NamedType && offset <= type.name2.end)) {
+                (type is NamedType && offset <= type.name.end)) {
               _forTypeAnnotation(node);
             }
           }
@@ -1626,7 +1626,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
             if (namedType.end < offset) {
               identifierHelper(
                 includePrivateIdentifiers: false,
-              ).addSuggestionsFromTypeName(namedType.name2.lexeme);
+              ).addSuggestionsFromTypeName(namedType.name.lexeme);
               return;
             }
           }
@@ -1674,7 +1674,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
   @override
   void visitImportPrefixReference(ImportPrefixReference node) {
     var parent = node.parent;
-    if (parent is NamedType && offset <= parent.name2.offset) {
+    if (parent is NamedType && offset <= parent.name.offset) {
       var element = node.element2;
       DartType type;
       collector.completionLocation = 'PropertyAccess_propertyName';
@@ -2582,7 +2582,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
         if (type.importPrefix case var importPrefix?) {
           var prefixElement = importPrefix.element2;
           if (prefixElement is PrefixElement) {
-            if (type.name2.coversOffset(offset)) {
+            if (type.name.coversOffset(offset)) {
               declarationHelper(
                 mustBeType: true,
               ).addDeclarationsThroughImportPrefix(prefixElement);
@@ -2786,7 +2786,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
           if (namedType.end < offset) {
             identifierHelper(
               includePrivateIdentifiers: false,
-            ).addSuggestionsFromTypeName(namedType.name2.lexeme);
+            ).addSuggestionsFromTypeName(namedType.name.lexeme);
             return;
           }
         }
@@ -3585,7 +3585,7 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
         if (node.type case NamedType namedType) {
           identifierHelper(
             includePrivateIdentifiers: false,
-          ).addSuggestionsFromTypeName(namedType.name2.lexeme);
+          ).addSuggestionsFromTypeName(namedType.name.lexeme);
         }
       }
     } else if (parent is PatternField) {

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

@@ -197,7 +197,7 @@ class AddDiagnosticPropertyReference extends ResolvedCorrectionProducer {
         var identifier = parameter.name;
         if (type is NamedType &&
             identifier != null &&
-            type.name2.lexeme == 'DiagnosticPropertiesBuilder') {
+            type.name.lexeme == 'DiagnosticPropertiesBuilder') {
           return identifier.lexeme;
         }
       }

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

@@ -114,7 +114,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
     Token? nameToken;
     if (node is NamedType) {
       prefixName = node.importPrefix?.name.lexeme;
-      nameToken = node.name2;
+      nameToken = node.name;
     } else if (node is PrefixedIdentifier &&
         node.parent is NamedType &&
         node.prefix.element is PrefixElement) {

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

@@ -54,7 +54,7 @@ class CreateClass extends ResolvedCorrectionProducer {
           return;
         }
       }
-      className = targetNode.name2.lexeme;
+      className = targetNode.name.lexeme;
       requiresConstConstructor |= _requiresConstConstructor(targetNode);
     } else if (targetNode case SimpleIdentifier(
       :var parent,