From abda30f198aea36f495d4224a63d005f1e5e74d4 Mon Sep 17 00:00:00 2001 From: Brian Wilkerson Date: Fri, 9 Dec 2022 01:13:28 +0000 Subject: [PATCH] Replace NodeLocator in two more places Change-Id: I34a67ae8b370ec4c400ac5b9195d537380aca3c7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/274080 Reviewed-by: Konstantin Shcheglov Commit-Queue: Brian Wilkerson --- .../lib/src/computer/computer_lazy_type_hierarchy.dart | 4 ++-- .../lib/src/services/flutter/widget_descriptions.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart b/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart index 24830bf2c56..cf1d0b6fe87 100644 --- a/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart +++ b/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart @@ -8,9 +8,9 @@ import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.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/dart/element/element.dart'; import 'package:analyzer/src/utilities/extensions/analysis_session.dart'; +import 'package:analyzer/src/utilities/extensions/ast.dart'; import 'package:collection/collection.dart'; /// A lazy computer for Type Hierarchies. @@ -81,7 +81,7 @@ class DartLazyTypeHierarchyComputer { /// Finds a target for starting type hierarchy navigation at [offset]. TypeHierarchyItem? findTarget(int offset) { - final node = NodeLocator2(offset).searchWithin(_result.unit); + final node = _result.unit.nodeCovering(offset: offset); DartType? type; diff --git a/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart b/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart index 693c461418f..efb6102582c 100644 --- a/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart +++ b/pkg/analysis_server/lib/src/services/flutter/widget_descriptions.dart @@ -11,7 +11,7 @@ import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.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/src/utilities/extensions/ast.dart'; import 'package:dart_style/dart_style.dart'; /// The result of [WidgetDescriptions.setPropertyValue] invocation. @@ -144,7 +144,7 @@ class _WidgetDescriptionComputer { Flutter get _flutter => Flutter.instance; Future<_WidgetDescription?> compute() async { - var node = NodeLocator2(widgetOffset).searchWithin(resolvedUnit.unit); + var node = resolvedUnit.unit.nodeCovering(offset: widgetOffset); if (node == null) { return null; }