Remove three more uses of NodeLocator2

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

Author: bwilkerson

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

@@ -11,7 +11,6 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 
 /// Handles textDocument/colorPresentation.
@@ -232,7 +231,7 @@ class DocumentColorPresentationHandler
   /// `const` should be inserted if the existing expression is constant but
   /// we are not already in a constant context.
   bool _willRequireConstKeyword(int offset, ResolvedUnitResult unit) {
-    var node = NodeLocator2(offset).searchWithin(unit.unit);
+    var node = unit.unit.nodeCovering(offset: offset);
     if (node is! Expression) {
       return false;
     }

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

@@ -30,7 +30,6 @@ import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/analysis/session_helper.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 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';
@@ -785,7 +784,7 @@ final class ExtractMethodRefactoringImpl extends RefactoringImpl
       return null;
     }
     var offset = _selectionRange.offset;
-    var node = NodeLocator2(offset, offset).searchWithin(_resolveResult.unit);
+    var node = _resolveResult.unit.nodeCovering(offset: offset);
 
     // Check for the parameter list of a FunctionExpression.
     {

pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart

@@ -13,7 +13,6 @@ import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/source/source_range.dart';
-import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/services/top_level_declarations.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart'
@@ -2684,8 +2683,13 @@ class _EnclosingElementFinder {
 
   _EnclosingElementFinder();
 
-  void find(AstNode? target, int offset) {
-    var node = NodeLocator2(offset).searchWithin(target);
+  void find(CompilationUnit target, int offset) {
+    var node = target.nodeCovering(offset: offset);
+    if (node != null && offset == node.end) {
+      // If the offset is just outside the node, then the element declared by
+      // the node isn't actually enclosing the offset.
+      node = node.parent;
+    }
     while (node != null) {
       if (node is ClassDeclaration) {
         enclosingClass = node.declaredFragment?.element;