Deprecate getters and methods within analyzer/lib/src/dart/ast

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

Author: fshcheglov

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

@@ -377,7 +377,7 @@ class DartCallHierarchyComputer {
       node = node.propertyName;
     }
 
-    var element = ElementLocator.locate2(node);
+    var element = ElementLocator.locate(node);
 
     // Don't consider synthetic getter/setter for a field to be executable
     // since they don't contain any executable code.

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

@@ -805,7 +805,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
         exceptionParameter.name,
         HighlightRegionType.LOCAL_VARIABLE_DECLARATION,
         additionalSemanticTokenModifiers: _additionalModifiersForElement(
-          exceptionParameter.declaredElement2,
+          exceptionParameter.declaredElement,
         ),
       );
     }
@@ -815,7 +815,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
         stackTraceParameter.name,
         HighlightRegionType.LOCAL_VARIABLE_DECLARATION,
         additionalSemanticTokenModifiers: _additionalModifiersForElement(
-          stackTraceParameter.declaredElement2,
+          stackTraceParameter.declaredElement,
         ),
       );
     }
@@ -940,7 +940,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
       node.name,
       HighlightRegionType.LOCAL_VARIABLE_DECLARATION,
       additionalSemanticTokenModifiers: _additionalModifiersForElement(
-        node.declaredElement2,
+        node.declaredElement,
       ),
     );
 
@@ -1504,7 +1504,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
     computer._addIdentifierRegion(
       parent: node,
       nameToken: node.name,
-      element: node.element2,
+      element: node.element,
     );
 
     node.typeArguments?.accept(this);
@@ -1552,7 +1552,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
     if (name != null) {
       // Patterns can be method tear-offs as well as getters:
       // https://github.com/dart-lang/sdk/issues/59976#issuecomment-2613558317
-      var type = switch (node.element2) {
+      var type = switch (node.element) {
         MethodElement() => HighlightRegionType.INSTANCE_METHOD_TEAR_OFF,
         _ => HighlightRegionType.INSTANCE_GETTER_REFERENCE,
       };
@@ -1688,7 +1688,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
       computer._addIdentifierRegion(
         parent: parent,
         nameToken: node.token,
-        element: node.writeOrReadElement2,
+        element: node.writeOrReadElement,
       );
     }
     super.visitSimpleIdentifier(node);
@@ -1849,7 +1849,7 @@ class _DartUnitHighlightsComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
-    var element = node.declaredFragment?.element ?? node.declaredElement2;
+    var element = node.declaredFragment?.element ?? node.declaredElement;
     if (element is FieldElement) {
       computer._addRegion_token(
         node.name,

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

@@ -56,13 +56,13 @@ class DartUnitHoverComputer {
         node is VariablePattern ||
         node is PatternFieldName ||
         node is DartPattern ||
-        (node is LibraryDirective && node.name2 == null) ||
+        (node is LibraryDirective && node.name == null) ||
         (node is SimpleIdentifier && node.parent is ImportDirective) ||
         node is ImportPrefixReference) {
       var range = _hoverRange(node, locationEntity);
       var hover = HoverInformation(range.offset, range.length);
       // element
-      var element = ElementLocator.locate2(node);
+      var element = ElementLocator.locate(node);
       if (element != null) {
         // short code that illustrates the element meaning.
         hover.elementDescription = _elementDisplayString(node, element);

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

@@ -271,7 +271,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement2;
+    var declaration = node.declaredElement;
     if (declaration is LocalVariableElement) {
       _computer._addTypePrefix(node.name, declaration.type);
     }
@@ -286,7 +286,7 @@ class _DartInlayHintComputerVisitor extends GeneralizingAstVisitor<void> {
       return;
     }
 
-    var declaration = node.declaredElement2;
+    var declaration = node.declaredElement;
     if (declaration != null) {
       _computer._addTypePrefix(node.name, declaration.type);
     }

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

@@ -42,7 +42,7 @@ class DartUnitSignatureComputer {
     var parent = argumentList.parent;
     if (parent is MethodInvocation) {
       name = parent.methodName.name;
-      element = ElementLocator.locate2(parent);
+      element = ElementLocator.locate(parent);
       parameters =
           element is FunctionTypedElement ? element.formalParameters : null;
     } else if (parent is InstanceCreationExpression) {
@@ -51,7 +51,7 @@ class DartUnitSignatureComputer {
       if (constructorName != null) {
         name += '.${constructorName.name}';
       }
-      element = ElementLocator.locate2(parent);
+      element = ElementLocator.locate(parent);
       parameters =
           element is FunctionTypedElement ? element.formalParameters : null;
     } else if (parent case FunctionExpressionInvocation(

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

@@ -44,9 +44,9 @@ class DartTypeArgumentsSignatureComputer {
     var parent = argumentList.parent;
     Element? element;
     if (parent is NamedType) {
-      element = parent.element2;
+      element = parent.element;
     } else if (parent is MethodInvocation) {
-      element = ElementLocator.locate2(parent.methodName);
+      element = ElementLocator.locate(parent.methodName);
     }
     if (element is! TypeParameterizedElement ||
         element.typeParameters2.isEmpty) {

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

@@ -71,8 +71,8 @@ class _Visitor extends UnifyingAstVisitor<void> {
   void visitNamedType(NamedType node) {
     if (node.offset <= endOffset && node.end >= startOffset) {
       var importPrefix = node.importPrefix;
-      var prefix = importPrefix?.element2?.name3 ?? '';
-      _addElement(prefix, node.element2);
+      var prefix = importPrefix?.element?.name3 ?? '';
+      _addElement(prefix, node.element);
     }
 
     super.visitNamedType(node);
@@ -91,7 +91,7 @@ class _Visitor extends UnifyingAstVisitor<void> {
         node.offset <= endOffset &&
         node.end >= startOffset &&
         !_isConstructorDeclarationReturnType(node)) {
-      var nodeElement = node.writeOrReadElement2;
+      var nodeElement = node.writeOrReadElement;
 
       var prefix = '';
       var parent = node.parent;

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

@@ -39,7 +39,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitAssignedVariablePattern(AssignedVariablePattern node) {
-    var element = node.element2;
+    var element = node.element;
     if (element != null) {
       _addOccurrence(element, node.name);
     }
@@ -100,10 +100,10 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    if (node.declaredElement2 case BindPatternVariableElement(:var join2?)) {
+    if (node.declaredElement case BindPatternVariableElement(:var join2?)) {
       _addOccurrence(join2.baseElement, node.name);
     } else {
-      _addOccurrence(node.declaredElement2!, node.name);
+      _addOccurrence(node.declaredElement!, node.name);
     }
 
     super.visitDeclaredVariablePattern(node);
@@ -134,7 +134,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitExtensionOverride(ExtensionOverride node) {
-    _addOccurrence(node.element2, node.name);
+    _addOccurrence(node.element, node.name);
 
     super.visitExtensionOverride(node);
   }
@@ -182,7 +182,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitImportPrefixReference(ImportPrefixReference node) {
-    _addOccurrence(node.element2!, node.name);
+    _addOccurrence(node.element!, node.name);
 
     super.visitImportPrefixReference(node);
   }
@@ -203,7 +203,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitNamedType(NamedType node) {
-    var element = node.element2;
+    var element = node.element;
     if (element != null) {
       _addOccurrence(element, node.name);
     }
@@ -213,7 +213,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitPatternField(PatternField node) {
-    var element = node.element2;
+    var element = node.element;
     var pattern = node.pattern;
     // If no explicit field name, use the variables name.
     var name =
@@ -257,7 +257,7 @@ class DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor<void> {
       return;
     }
 
-    var element = node.writeOrReadElement2;
+    var element = node.writeOrReadElement;
     if (element != null) {
       _addOccurrence(element, node.token);
     }

pkg/analysis_server/lib/src/lsp/handlers/custom/handler_imports.dart

@@ -63,7 +63,7 @@ class ImportsHandler
         return success(null);
       }
 
-      var element = ElementLocator.locate2(node);
+      var element = ElementLocator.locate(node);
       if (element == null) {
         return success(null);
       }

pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart

@@ -50,7 +50,7 @@ class SuperHandler
         return success(null);
       }
 
-      var element = ElementLocator.locate2(node);
+      var element = ElementLocator.locate(node);
       if (element == null) {
         return success(null);
       }