commit 5ae02ab4c3de4af4ebffe7174019a65d9895edcc
author Konstantin Shcheglov <scheglov@google.com> Fri Jan 15 18:48:57 2021 +0000
committer Konstantin Shcheglov <scheglov@google.com> Fri Jan 15 18:48:57 2021 +0000
tree 697db65e14931d428ca374258cfbb04524d19707
parent 73bd44d3638ba7aac553576f8fa19253ae3f75e0

Fix merge conflict findNodeAtString vs. FindNode.

R=brianwilkerson@google.com, paulberry@google.com

Change-Id: I7953b2b6e2f2201297c6ae91e36d69297a23ff15
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/179580
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>

pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart

diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart
index 89ec9da..f462b36 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/element_matcher_test.dart
@@ -22,7 +22,7 @@
       {List<String> expectedComponents,
       List<ElementKind> expectedKinds,
       List<String> expectedUris}) {
-    var node = findNodeAtString(search);
+    var node = findNode.any(search);
     var matcher = ElementMatcher.forNode(node);
     if (expectedUris != null) {
       expect(matcher.importedUris,