DAS: Move getElementOfNode out of AnalysisServer into utility

This method could have been static the whole time; never referenced
instance code from AnalysisServer; and then it just doesn't belong
on that class.

Change-Id: I81e8a1e65dd379ad89e3f4ab36f10983e96eaeb5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423169
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analysis_server/lib/src/analysis_server.dart

@@ -31,7 +31,6 @@ import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
 import 'package:analysis_server/src/server/diagnostic_server.dart';
 import 'package:analysis_server/src/services/completion/completion_performance.dart';
 import 'package:analysis_server/src/services/correction/fix_performance.dart';
-import 'package:analysis_server/src/services/correction/namespace.dart';
 import 'package:analysis_server/src/services/correction/refactoring_performance.dart';
 import 'package:analysis_server/src/services/dart_tooling_daemon/dtd_services.dart';
 import 'package:analysis_server/src/services/pub/pub_api.dart';
@@ -44,6 +43,7 @@ import 'package:analysis_server/src/services/search/search_engine_internal.dart'
 import 'package:analysis_server/src/services/user_prompts/dart_fix_prompt_manager.dart';
 import 'package:analysis_server/src/services/user_prompts/survey_manager.dart';
 import 'package:analysis_server/src/services/user_prompts/user_prompts.dart';
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analysis_server/src/utilities/file_string_sink.dart';
 import 'package:analysis_server/src/utilities/process.dart';
 import 'package:analysis_server/src/utilities/request_statistics.dart';
@@ -53,7 +53,6 @@ import 'package:analysis_server_plugin/src/correction/assist_performance.dart';
 import 'package:analysis_server_plugin/src/correction/performance.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
-import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/exception/exception.dart';
 import 'package:analyzer/file_system/file_system.dart';
@@ -74,13 +73,11 @@ import 'package:analyzer/src/dart/analysis/results.dart';
 import 'package:analyzer/src/dart/analysis/session.dart';
 import 'package:analyzer/src/dart/analysis/status.dart' as analysis;
 import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart';
-import 'package:analyzer/src/dart/ast/element_locator.dart';
 import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:analyzer/src/util/performance/operation_performance.dart';
 import 'package:analyzer/src/utilities/extensions/analysis_session.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/protocol/protocol.dart';
 import 'package:analyzer_plugin/src/protocol/protocol_internal.dart'
@@ -661,44 +658,8 @@ abstract class AnalysisServer {
       }
     }
 
-    var unit = unitResult.unit;
-    return getElementOfNode(unit.nodeCovering(offset: offset));
-  }
-
-  /// Returns the element associated with the [node].
-  ///
-  /// If [useMockForImport] is `true` then a [MockLibraryImportElement] will be
-  /// returned when an import directive or a prefix element is associated with
-  /// the [node]. The rename-prefix refactoring should be updated to not require
-  /// this work-around.
-  ///
-  /// Returns `null` if [node] is `null` or doesn't have an element.
-  Element2? getElementOfNode(AstNode? node, {bool useMockForImport = false}) {
-    if (node == null) {
-      return null;
-    }
-    if (node is SimpleIdentifier && node.parent is LibraryIdentifier) {
-      node = node.parent;
-    }
-    if (node is LibraryIdentifier) {
-      node = node.parent;
-    }
-    if (node is StringLiteral && node.parent is UriBasedDirective) {
-      return null;
-    }
-
-    Element2? element;
-    if (useMockForImport && node is ImportDirective) {
-      element = MockLibraryImportElement(node.libraryImport!);
-    } else {
-      element = ElementLocator.locate2(node);
-    }
-    if (useMockForImport &&
-        node is SimpleIdentifier &&
-        element is PrefixElement2) {
-      element = MockLibraryImportElement(getImportElement(node)!);
-    }
-    return element;
+    var node = unitResult.unit.nodeCovering(offset: offset);
+    return node?.getElement();
   }
 
   /// Return a [LineInfo] for the file with the given [path].

pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart

@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:analysis_server/protocol/protocol_generated.dart';
 import 'package:analysis_server/src/handler/legacy/legacy_handler.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
@@ -75,7 +76,7 @@ class EditGetAvailableRefactoringsHandler extends LegacyHandler {
     var resolvedUnit = await server.getResolvedUnit(file);
     if (resolvedUnit != null) {
       var node = resolvedUnit.unit.nodeCovering(offset: offset);
-      var element = server.getElementOfNode(node);
+      var element = node?.getElement();
       if (element != null) {
         var refactoringWorkspace = server.refactoringWorkspace;
         // try CONVERT_METHOD_TO_GETTER

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

@@ -15,6 +15,7 @@ import 'package:analysis_server/src/services/correction/refactoring_performance.
 import 'package:analysis_server/src/services/refactoring/framework/refactoring_context.dart';
 import 'package:analysis_server/src/services/refactoring/framework/refactoring_processor.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analysis_server_plugin/edit/assist/assist.dart';
 import 'package:analysis_server_plugin/edit/assist/dart_assist_context.dart';
 import 'package:analysis_server_plugin/edit/fix/dart_fix_context.dart';
@@ -401,7 +402,7 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
         timer.restart();
 
         var node = unitResult.unit.nodeCovering(offset: offset);
-        var element = server.getElementOfNode(node);
+        var element = node?.getElement();
 
         // Getter to Method
         if (element is GetterElement &&

pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart

@@ -13,6 +13,7 @@ import 'package:analysis_server/src/lsp/handlers/handlers.dart';
 import 'package:analysis_server/src/lsp/progress.dart';
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/utilities/extensions/ast.dart';
@@ -126,7 +127,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
 
       case RefactoringKind.CONVERT_GETTER_TO_METHOD:
         var node = result.unit.nodeCovering(offset: offset);
-        var element = server.getElementOfNode(node);
+        var element = node?.getElement();
         if (element is GetterElement) {
           var refactor = ConvertGetterToMethodRefactoring(
             server.refactoringWorkspace,
@@ -142,7 +143,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
 
       case RefactoringKind.CONVERT_METHOD_TO_GETTER:
         var node = result.unit.nodeCovering(offset: offset);
-        var element = server.getElementOfNode(node);
+        var element = node?.getElement();
         if (element is ExecutableElement2) {
           var refactor = ConvertMethodToGetterRefactoring(
             server.refactoringWorkspace,

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

@@ -9,6 +9,7 @@ import 'package:analysis_server/src/lsp/handlers/handlers.dart';
 import 'package:analysis_server/src/lsp/mapping.dart';
 import 'package:analysis_server/src/lsp/registration/feature_registration.dart';
 import 'package:analysis_server/src/search/type_hierarchy.dart';
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
@@ -63,7 +64,7 @@ class ImplementationHandler
     OperationPerformanceImpl performance,
   ) async {
     var node = result.unit.nodeCovering(offset: offset);
-    var element = server.getElementOfNode(node);
+    var element = node?.getElement();
     if (element == null) {
       return success([]);
     }

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

@@ -10,6 +10,7 @@ import 'package:analysis_server/src/lsp/registration/feature_registration.dart';
 import 'package:analysis_server/src/search/element_references.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart'
     show SearchMatch;
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
@@ -66,10 +67,10 @@ class ReferencesHandler
     var node = result.unit.nodeCovering(offset: offset);
     node = _getReferenceTargetNode(node);
 
-    var element = switch (server.getElementOfNode(node)) {
+    var element = switch (node?.getElement()) {
       FieldFormalParameterElement2(:var field2?) => field2,
       PropertyAccessorElement2(:var variable3?) => variable3,
-      (var element) => element,
+      var element => element,
     };
 
     if (element == null) {

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

@@ -13,6 +13,7 @@ import 'package:analysis_server/src/lsp/mapping.dart';
 import 'package:analysis_server/src/lsp/registration/feature_registration.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/rename_unit_member.dart';
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analysis_server/src/utilities/extensions/string.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
@@ -64,7 +65,7 @@ class PrepareRenameHandler
     return (unit, offset).mapResults((result, offset) async {
       var node = result.unit.nodeCovering(offset: offset);
       node = _tweakLocatedNode(node, offset);
-      var element = server.getElementOfNode(node, useMockForImport: true);
+      var element = node?.getElement(useMockForImport: true);
 
       if (node == null || element == null) {
         return success(null);
@@ -160,7 +161,7 @@ class RenameHandler extends LspMessageHandler<RenameParams, WorkspaceEdit?> {
     ) async {
       var node = result.unit.nodeCovering(offset: offset);
       node = _tweakLocatedNode(node, offset);
-      var element = server.getElementOfNode(node, useMockForImport: true);
+      var element = node?.getElement(useMockForImport: true);
       if (node == null || element == null) {
         return success(null);
       }

pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart

@@ -15,6 +15,7 @@ import 'package:analysis_server/src/protocol_server.dart'
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
+import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
@@ -223,7 +224,7 @@ class RefactoringManager {
       var resolvedUnit = await server.getResolvedUnit(file);
       if (resolvedUnit != null) {
         var node = resolvedUnit.unit.nodeCovering(offset: offset);
-        var element = server.getElementOfNode(node);
+        var element = node?.getElement();
         if (element is GetterElement) {
           refactoring = ConvertGetterToMethodRefactoring(
             refactoringWorkspace,
@@ -236,7 +237,7 @@ class RefactoringManager {
       var resolvedUnit = await server.getResolvedUnit(file);
       if (resolvedUnit != null) {
         var node = resolvedUnit.unit.nodeCovering(offset: offset);
-        var element = server.getElementOfNode(node);
+        var element = node?.getElement();
         if (element is ExecutableElement2) {
           refactoring = ConvertMethodToGetterRefactoring(
             refactoringWorkspace,
@@ -316,7 +317,7 @@ class RefactoringManager {
       var resolvedUnit = await server.getResolvedUnit(file);
       if (resolvedUnit != null) {
         var node = resolvedUnit.unit.nodeCovering(offset: offset);
-        var element = server.getElementOfNode(node, useMockForImport: true);
+        var element = node?.getElement(useMockForImport: true);
         if (node is RepresentationDeclaration) {
           var extensionType = node.parent;
           if (extensionType is ExtensionTypeDeclaration &&

pkg/analysis_server/lib/src/utilities/extensions/ast.dart

@@ -2,16 +2,19 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:analysis_server/src/services/correction/namespace.dart';
 import 'package:analysis_server/src/utilities/extensions/element.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/source/source.dart';
+import 'package:analyzer/src/dart/ast/element_locator.dart';
 import 'package:analyzer/src/dart/ast/token.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/utilities/extensions/ast.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class ThrowStatement {
   final ExpressionStatement statement;
@@ -188,6 +191,40 @@ extension AstNodeExtension on AstNode {
     }
     return null;
   }
+
+  /// Returns the element associated with `this`.
+  ///
+  /// If [useMockForImport] is `true` then a [MockLibraryImportElement] will be
+  /// returned when an import directive or a prefix element is associated with
+  /// `this`. The rename-prefix refactoring should be updated to not require
+  /// this work-around.
+  ///
+  /// Returns `null` if `this` is `null` or doesn't have an element.
+  Element2? getElement({bool useMockForImport = false}) {
+    AstNode? node = this;
+    if (node is SimpleIdentifier && node.parent is LibraryIdentifier) {
+      node = node.parent;
+    }
+    if (node is LibraryIdentifier) {
+      node = node.parent;
+    }
+    if (node is StringLiteral && node.parent is UriBasedDirective) {
+      return null;
+    }
+
+    Element2? element;
+    if (useMockForImport && node is ImportDirective) {
+      element = MockLibraryImportElement(node.libraryImport!);
+    } else {
+      element = ElementLocator.locate2(node);
+    }
+    if (useMockForImport &&
+        node is SimpleIdentifier &&
+        element is PrefixElement2) {
+      element = MockLibraryImportElement(getImportElement(node)!);
+    }
+    return element;
+  }
 }
 
 extension BinaryExpressionExtension on BinaryExpression {