DAS: Migrate code off NodeLocator to coveringNode

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

Author: srawlins

pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart

@@ -13,10 +13,10 @@ import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/dart/element/type_system.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/utilities/extensions/ast.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 import 'package:collection/collection.dart';
@@ -401,7 +401,7 @@ final class PostfixCompletionProcessor {
   CompilationUnit get _unit => _completionContext.resolveResult.unit;
 
   Future<PostfixCompletion> compute() async {
-    _node = _selectedNode();
+    _node = _unit.nodeCovering(offset: _selectionOffset);
     if (_node == null) {
       return _noCompletion;
     }
@@ -568,7 +568,7 @@ final class PostfixCompletionProcessor {
   }
 
   Future<bool> isApplicable() async {
-    _node = _selectedNode();
+    _node = _unit.nodeCovering(offset: _selectionOffset);
     if (_node == null) {
       return false;
     }
@@ -658,9 +658,6 @@ final class PostfixCompletionProcessor {
     return expr;
   }
 
-  AstNode? _selectedNode({int? at}) =>
-      NodeLocator(at ?? _selectionOffset).searchWithin(_unit);
-
   void _setCompletionFromBuilder(
     ChangeBuilder builder,
     PostfixCompletionKind kind,

pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart

@@ -20,10 +20,10 @@ import 'package:analyzer/error/error.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/source/source_range.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/error/syntactic_errors.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/java_core.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 import 'package:collection/collection.dart';
 
@@ -922,8 +922,7 @@ class StatementCompletionProcessor {
     var argList =
         _selectedNode(
           at: selectionOffset,
-        )?.thisOrAncestorOfType<ArgumentList>();
-    argList ??=
+        )?.thisOrAncestorOfType<ArgumentList>() ??
         _selectedNode(
           at: parenError.offset,
         )?.thisOrAncestorOfType<ArgumentList>();
@@ -1273,7 +1272,7 @@ class StatementCompletionProcessor {
   }
 
   AstNode? _selectedNode({int? at}) =>
-      NodeLocator(at ?? selectionOffset).searchWithin(unit);
+      unit.nodeCovering(offset: at ?? selectionOffset);
 
   void _setCompletion(StatementCompletionKind kind) {
     assert(exitPosition != null);

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

@@ -9,8 +9,8 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/error/error.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
@@ -253,10 +253,10 @@ class AddDiagnosticPropertyReference extends ResolvedCorrectionProducer {
 
     // Compute the information for all the properties to be added.
     for (var error in propertyErrors) {
-      var selectionOffset = error.offset;
-      var selectionEnd = selectionOffset + error.length;
-      var locator = NodeLocator(selectionOffset, selectionEnd);
-      var node = locator.searchWithin(unitResult.unit);
+      var node = unitResult.unit.nodeCovering(
+        offset: error.offset,
+        length: error.length,
+      );
       if (node == null) {
         continue;
       }

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

@@ -7,7 +7,7 @@ import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.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';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -50,7 +50,7 @@ class MakeVariableNotFinal extends ResolvedCorrectionProducer {
       return;
     }
 
-    var declaration = NodeLocator(nameOffset).searchWithin(unit);
+    var declaration = unit.nodeCovering(offset: nameOffset);
     var declarationList = declaration?.parent;
 
     if (declaration is VariableDeclaration &&

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

@@ -13,7 +13,7 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /// [ConvertMethodToGetterRefactoring] implementation.
@@ -149,7 +149,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
       );
       var refUnit = resolvedUnit?.unit;
       if (refUnit == null) continue;
-      var refNode = NodeLocator(refRange.offset).searchWithin(refUnit);
+      var refNode = refUnit.nodeCovering(offset: refRange.offset);
       var invocation = refNode?.thisOrAncestorOfType<MethodInvocation>();
 
       // we need invocation

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

@@ -23,8 +23,8 @@ import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/source_range.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/generated/java_core.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 const String _TOKEN_SEPARATOR = '\uFFFF';
@@ -285,11 +285,10 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
       selectionRange = SourceRange(offset, end - offset);
     }
 
-    // get covering node
-    var coveringNode = NodeLocator(
-      selectionRange.offset,
-      selectionRange.end,
-    ).searchWithin(unit);
+    var coveringNode = unit.nodeCovering(
+      offset: selectionRange.offset,
+      length: selectionRange.length,
+    );
 
     // We need an enclosing function.
     // If it has a block body, we can add a new variable declaration statement
@@ -480,7 +479,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl
   List<AstNode> _findNodes(List<SourceRange> ranges) {
     var nodes = <AstNode>[];
     for (var range in ranges) {
-      var node = NodeLocator(range.offset).searchWithin(unit)!;
+      var node = unit.nodeCovering(offset: range.offset)!;
       nodes.add(node);
     }
     return nodes;

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

@@ -35,6 +35,7 @@ import 'package:analyzer/src/dart/resolver/exit_detector.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/utilities/extensions/ast.dart';
 import 'package:analyzer/src/utilities/extensions/string.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 import 'package:meta/meta.dart';
 
@@ -314,7 +315,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
 
   @override
   String get refactoringName {
-    var node = NodeLocator(_selectionOffset).searchWithin(_resolveResult.unit);
+    var node = _resolveResult.unit.nodeCovering(offset: _selectionOffset);
     if (node != null && node.thisOrAncestorOfType<ClassDeclaration>() != null) {
       return 'Extract Method';
     }

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

@@ -19,9 +19,9 @@ import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/generated/java_core.dart';
 import 'package:analyzer/src/utilities/extensions/flutter.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
@@ -177,10 +177,7 @@ class ExtractWidgetRefactoringImpl extends RefactoringImpl
 
   /// Checks if [offset] is a widget creation expression that can be extracted.
   RefactoringStatus _checkSelection() {
-    var node = NodeLocator(
-      offset,
-      offset + length,
-    ).searchWithin(resolveResult.unit);
+    var node = resolveResult.unit.nodeCovering(offset: offset, length: length);
 
     // Treat single ReturnStatement as its expression.
     if (node is ReturnStatement) {

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

@@ -14,8 +14,8 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/generated/java_core.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 /// [InlineLocalRefactoring] implementation.
@@ -52,9 +52,8 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
 
   @override
   Future<RefactoringStatus> checkInitialConditions() async {
-    // prepare variable
     Element2? element;
-    var offsetNode = NodeLocator(offset).searchWithin(resolveResult.unit);
+    var offsetNode = resolveResult.unit.nodeCovering(offset: offset);
     if (offsetNode is SimpleIdentifier) {
       element = offsetNode.element;
     } else if (offsetNode is VariableDeclaration) {
@@ -180,7 +179,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
   /// Checks if [offset] is a variable that can be inlined.
   RefactoringStatus _checkOffset() {
     Element2? element;
-    var offsetNode = NodeLocator(offset).searchWithin(resolveResult.unit);
+    var offsetNode = resolveResult.unit.nodeCovering(offset: offset);
     if (offsetNode is SimpleIdentifier) {
       element = offsetNode.element;
     } else if (offsetNode is VariableDeclaration) {

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

@@ -22,7 +22,7 @@ import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
+import 'package:analyzer/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/src/utilities/extensions/resolved_unit_result.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
@@ -356,7 +356,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
       'Method declaration or reference must be selected to activate this refactoring.',
     );
 
-    var selectedNode = NodeLocator(offset).searchWithin(resolveResult.unit);
+    var selectedNode = resolveResult.unit.nodeCovering(offset: offset);
     Element2? element;
 
     if (selectedNode is FunctionDeclaration) {
@@ -412,7 +412,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     );
 
     // prepare selected SimpleIdentifier
-    var selectedNode = NodeLocator(offset).searchWithin(resolveResult.unit);
+    var selectedNode = resolveResult.unit.nodeCovering(offset: offset);
     Element2? element;
     if (selectedNode is FunctionDeclaration) {
       element = selectedNode.declaredFragment?.element;