DAS: Migrate many uses of NodeLocator to nodeCovering

srawlins · Commit Queue · commit b0e12e56fd6a · 2025-04-17T12:38:09.000-07:00
Change-Id: I97d4137c2daaa562332a83eec4e11208bb008c38 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423081 Auto-Submit: Samuel Rawlins <srawlins@google.com> Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -75,13 +75,13 @@ 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/dart/ast/utilities.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'
     as analyzer_plugin;
@@ -740,7 +740,7 @@ abstract class AnalysisServer {
     var result = await getResolvedUnit(file);
     var unit = result?.unit;
     if (unit != null) {
-      return NodeLocator(offset).searchWithin(unit);
+      return unit.nodeCovering(offset: offset);
     }
     return null;
   }
diff --git a/pkg/analysis_server/lib/src/cider/rename.dart b/pkg/analysis_server/lib/src/cider/rename.dart
@@ -19,6 +19,7 @@ import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 class CanRenameResponse {
   final LineInfo lineInfo;
@@ -349,9 +350,9 @@ class CheckNameResponse {
   ) async {
     var resolvedUnit = await canRename._fileResolver.resolve(path: path);
     var lineInfo = resolvedUnit.lineInfo;
-    var node = NodeLocator(
-      lineInfo.getOffsetOfLine(loc.lineNumber - 1) + loc.columnNumber,
-    ).searchWithin(resolvedUnit.unit);
+    var node = resolvedUnit.unit.nodeCovering(
+      offset: lineInfo.getOffsetOfLine(loc.lineNumber - 1) + loc.columnNumber,
+    );
     if (node is SimpleIdentifier) {
       var parent = node.parent;
       if (parent is InterpolationExpression && parent.rightBracket == null) {
diff --git a/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart b/pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart
@@ -10,8 +10,8 @@ import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/ast/element_locator.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 /// Returns the container for [element] that should be used in Call Hierarchy.
 ///
@@ -330,7 +330,7 @@ class DartCallHierarchyComputer {
 
   /// Finds a target node for call hierarchy navigation at [offset].
   AstNode? _findTargetNode(int offset) {
-    var node = NodeLocator(offset).searchWithin(_result.unit);
+    var node = _result.unit.nodeCovering(offset: offset);
     if (node is SimpleIdentifier &&
         node.parent != null &&
         node.parent is! VariableDeclaration &&
@@ -436,7 +436,7 @@ class DartCallHierarchyComputer {
     );
 
     if (result is ParsedUnitResult) {
-      var node = NodeLocator(offset).searchWithin(result.unit);
+      var node = result.unit.nodeCovering(offset: offset);
       if (node != null && !node.isSynthetic) {
         var parent = node.parent;
         // Handle named constructors which have their `.` included in the
diff --git a/pkg/analysis_server/lib/src/computer/computer_hover.dart b/pkg/analysis_server/lib/src/computer/computer_hover.dart
@@ -10,8 +10,8 @@ import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/element_locator.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:path/path.dart' as path;
 
 /// Information about a library to display in a hover.
@@ -35,7 +35,7 @@ class DartUnitHoverComputer {
 
   /// Returns the computed hover, maybe `null`.
   HoverInformation? compute() {
-    var node = NodeLocator(_offset).searchWithin(_unit);
+    var node = _unit.nodeCovering(offset: _offset);
     if (node == null) {
       return null;
     }
diff --git a/pkg/analysis_server/lib/src/computer/computer_selection_ranges.dart b/pkg/analysis_server/lib/src/computer/computer_selection_ranges.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 /// Computes selection ranges for a specific offset of a Dart [CompilationUnit].
 ///
@@ -19,7 +19,7 @@ class DartSelectionRangeComputer {
   /// Returns selection ranges for nodes containing [_offset], starting with the
   /// closest working up to the outer-most node.
   List<SelectionRange> compute() {
-    var node = NodeLocator(_offset).searchWithin(_unit);
+    var node = _unit.nodeCovering(offset: _offset);
     if (node == null) {
       return [];
     }
diff --git a/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart b/pkg/analysis_server/lib/src/computer/computer_type_arguments_signature.dart
@@ -9,8 +9,8 @@ import 'package:analysis_server/src/lsp/mapping.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/ast/element_locator.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 /// A computer for the signature help information about the type parameters for
 /// the [TypeArgumentList] surrounding the specified offset of a Dart
@@ -29,7 +29,7 @@ class DartTypeArgumentsSignatureComputer {
     this.preferredFormats, {
     this.documentationPreference = DocumentationPreference.full,
   }) : _documentationComputer = DartDocumentationComputer(dartdocInfo),
-       _node = NodeLocator(offset).searchWithin(unit);
+       _node = unit.nodeCovering(offset: offset);
 
   /// The [TypeArgumentList] node located by [compute].
   TypeArgumentList get argumentList => _argumentList;
diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_get_available_refactorings.dart
@@ -8,7 +8,7 @@ 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:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
 
 /// The handler for the `edit.getAvailableRefactorings` request.
@@ -74,7 +74,7 @@ class EditGetAvailableRefactoringsHandler extends LegacyHandler {
     // check elements
     var resolvedUnit = await server.getResolvedUnit(file);
     if (resolvedUnit != null) {
-      var node = NodeLocator(offset).searchWithin(resolvedUnit.unit);
+      var node = resolvedUnit.unit.nodeCovering(offset: offset);
       var element = server.getElementOfNode(node);
       if (element != null) {
         var refactoringWorkspace = server.refactoringWorkspace;
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart b/pkg/analysis_server/lib/src/lsp/handlers/code_actions/dart.dart
@@ -26,8 +26,8 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart'
     show InconsistentAnalysisException;
 import 'package:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 /// Produces [CodeAction]s from Dart source commands, fixes, assists and
 /// refactors from the server.
@@ -400,7 +400,7 @@ class DartCodeActionsProducer extends AbstractCodeActionsProducer {
       if (shouldIncludeKind(CodeActionKind.RefactorRewrite)) {
         timer.restart();
 
-        var node = NodeLocator(offset).searchWithin(unitResult.unit);
+        var node = unitResult.unit.nodeCovering(offset: offset);
         var element = server.getElementOfNode(node);
 
         // Getter to Method
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart b/pkg/analysis_server/lib/src/lsp/handlers/commands/abstract_refactor.dart
@@ -15,7 +15,7 @@ import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/refactoring/legacy/refactoring.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 final _manager = LspRefactorManager._();
 
@@ -125,7 +125,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
         return success(refactor);
 
       case RefactoringKind.CONVERT_GETTER_TO_METHOD:
-        var node = NodeLocator(offset).searchWithin(result.unit);
+        var node = result.unit.nodeCovering(offset: offset);
         var element = server.getElementOfNode(node);
         if (element is GetterElement) {
           var refactor = ConvertGetterToMethodRefactoring(
@@ -141,7 +141,7 @@ abstract class AbstractRefactorCommandHandler extends SimpleEditCommandHandler
         );
 
       case RefactoringKind.CONVERT_METHOD_TO_GETTER:
-        var node = NodeLocator(offset).searchWithin(result.unit);
+        var node = result.unit.nodeCovering(offset: offset);
         var element = server.getElementOfNode(node);
         if (element is ExecutableElement2) {
           var refactor = ConvertMethodToGetterRefactoring(
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_implementation.dart
@@ -11,8 +11,8 @@ import 'package:analysis_server/src/lsp/registration/feature_registration.dart';
 import 'package:analysis_server/src/search/type_hierarchy.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 typedef StaticOptions =
     Either3<bool, ImplementationOptions, ImplementationRegistrationOptions>;
@@ -62,7 +62,7 @@ class ImplementationHandler
     CancellationToken token,
     OperationPerformanceImpl performance,
   ) async {
-    var node = NodeLocator(offset).searchWithin(result.unit);
+    var node = result.unit.nodeCovering(offset: offset);
     var element = server.getElementOfNode(node);
     if (element == null) {
       return success([]);
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_references.dart
@@ -13,8 +13,8 @@ import 'package:analysis_server/src/services/search/search_engine.dart'
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 typedef StaticOptions = Either2<bool, ReferenceOptions>;
 
@@ -63,7 +63,7 @@ class ReferencesHandler
     ReferenceParams params,
     OperationPerformanceImpl performance,
   ) async {
-    var node = NodeLocator(offset).searchWithin(result.unit);
+    var node = result.unit.nodeCovering(offset: offset);
     node = _getReferenceTargetNode(node);
 
     var element = switch (server.getElementOfNode(node)) {
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_rename.dart
@@ -16,7 +16,7 @@ import 'package:analysis_server/src/services/refactoring/legacy/rename_unit_memb
 import 'package:analysis_server/src/utilities/extensions/string.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 AstNode? _tweakLocatedNode(AstNode? node, int offset) {
   if (node is RepresentationDeclaration) {
@@ -61,8 +61,8 @@ class PrepareRenameHandler
     var unit = await path.mapResult(requireResolvedUnit);
     var offset = unit.mapResultSync((unit) => toOffset(unit.lineInfo, pos));
 
-    return (unit, offset).mapResults((unit, offset) async {
-      var node = NodeLocator(offset).searchWithin(unit.unit);
+    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);
 
@@ -77,7 +77,7 @@ class PrepareRenameHandler
 
       var refactoring = RenameRefactoring.create(
         server.refactoringWorkspace,
-        unit,
+        result,
         refactorDetails.element,
       );
       if (refactoring == null) {
@@ -97,7 +97,7 @@ class PrepareRenameHandler
         TextDocumentPrepareRenameResult.t1(
           PrepareRenamePlaceholder(
             range: toRange(
-              unit.lineInfo,
+              result.lineInfo,
               // If the offset is set to -1 it means there is no location for the
               // old name. However since we must provide a range for LSP, we'll use
               // a 0-character span at the originally requested location to ensure
@@ -155,10 +155,10 @@ class RenameHandler extends LspMessageHandler<RenameParams, WorkspaceEdit?> {
     return (path, docIdentifier, unit, offset).mapResults((
       path,
       docIdentifier,
-      unit,
+      result,
       offset,
     ) async {
-      var node = NodeLocator(offset).searchWithin(unit.unit);
+      var node = result.unit.nodeCovering(offset: offset);
       node = _tweakLocatedNode(node, offset);
       var element = server.getElementOfNode(node, useMockForImport: true);
       if (node == null || element == null) {
@@ -172,7 +172,7 @@ class RenameHandler extends LspMessageHandler<RenameParams, WorkspaceEdit?> {
 
       var refactoring = RenameRefactoring.create(
         server.refactoringWorkspace,
-        unit,
+        result,
         refactorDetails.element,
       );
       if (refactoring == null) {
diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_type_definition.dart
@@ -13,8 +13,8 @@ import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 
 typedef StaticOptions =
     Either3<bool, TypeDefinitionOptions, TypeDefinitionRegistrationOptions>;
@@ -75,7 +75,7 @@ class TypeDefinitionHandler
 
       var offset = toOffset(result.lineInfo, pos);
       return offset.mapResult((offset) async {
-        var node = NodeLocator(offset).searchWithin(result.unit);
+        var node = result.unit.nodeCovering(offset: offset);
         if (node == null) {
           return success(_emptyResult);
         }
