Add access to FindElement2 in the test framework

Change-Id: I8a0def9df469a8e629e67e5c8cbd343bd076f74e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390925
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: bwilkerson

pkg/analysis_server/test/abstract_single_unit.dart

@@ -9,6 +9,7 @@ import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/error/codes.g.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/test_utilities/find_element_2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:test/test.dart';
 
@@ -25,6 +26,7 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   late LibraryElement testLibraryElement;
   late FindNode findNode;
   late FindElement findElement;
+  late FindElement2 findElement2;
 
   void addTestSource(String code) {
     testCode = code;
@@ -49,6 +51,7 @@ class AbstractSingleUnitTest extends AbstractContextTest {
     testUnit = result.unit;
     findNode = FindNode(testCode, testUnit);
     findElement = FindElement(testUnit);
+    findElement2 = FindElement2(testUnit);
     return result;
   }
 
@@ -73,6 +76,7 @@ class AbstractSingleUnitTest extends AbstractContextTest {
     testLibraryElement = testUnitElement.library;
     findNode = FindNode(testCode, testUnit);
     findElement = FindElement(testUnit);
+    findElement2 = FindElement2(testUnit);
     return result;
   }
 

pkg/analysis_server/test/services/search/search_engine_test.dart

@@ -8,6 +8,7 @@ import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/test_utilities/find_element_2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
 import 'package:analyzer/src/util/file_paths.dart';
@@ -30,6 +31,7 @@ class PubPackageResolutionTest extends AbstractContextTest {
   late ResolvedUnitResult result;
   late FindNode findNode;
   late FindElement findElement;
+  late FindElement2 findElement2;
 
   void addTestFile(String content) {
     newFile(testFile.path, content);
@@ -41,6 +43,7 @@ class PubPackageResolutionTest extends AbstractContextTest {
 
     findNode = FindNode(result.content, result.unit);
     findElement = FindElement(result.unit);
+    findElement2 = FindElement2(result.unit);
   }
 
   /// Put the [code] into the test file, and resolve it.
@@ -580,7 +583,7 @@ class B extends A {
   Future<void> test_searchReferences_parameter_topLevelShadow_wildcard() async {
     var code = '''
 int _ = 0;
-int f(int _) => _; 
+int f(int _) => _;
 ''';
     await resolveTestCode(code);
 
@@ -606,7 +609,7 @@ int f(int _) => _;
 
   Future<void> test_searchReferences_parameter_wildcard() async {
     var code = '''
-f(int _) {} 
+f(int _) {}
 ''';
     await resolveTestCode(code);
 

pkg/analyzer/test/src/dart/micro/file_resolution.dart

@@ -14,6 +14,7 @@ import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart';
 import 'package:analyzer/src/dart/micro/resolve_file.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/test_utilities/find_element_2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:analyzer/src/test_utilities/mock_sdk.dart';
 import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
@@ -137,6 +138,7 @@ class FileResolutionTest with ResourceProviderMixin, ResolutionTest {
     result = await resolveFile(testFile);
     findNode = FindNode(result.content, result.unit);
     findElement = FindElement(result.unit);
+    findElement2 = FindElement2(result.unit);
   }
 
   void setUp() {

pkg/analyzer/test/src/dart/resolution/resolution.dart

@@ -19,6 +19,7 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/test_utilities/find_element_2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
 import 'package:analyzer_utilities/testing/tree_string_sink.dart';
@@ -46,6 +47,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
   late ResolvedUnitResult result;
   late FindNode findNode;
   late FindElement findElement;
+  late FindElement2 findElement2;
 
   final DartObjectPrinterConfiguration dartObjectPrinterConfiguration =
       DartObjectPrinterConfiguration();
@@ -474,6 +476,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
 
     findNode = FindNode(result.content, result.unit);
     findElement = FindElement(result.unit);
+    findElement2 = FindElement2(result.unit);
   }
 
   /// Create a new file with the [path] and [content], resolve it into [result].
@@ -587,6 +590,10 @@ extension ResolvedUnitResultExtension on ResolvedUnitResult {
     return FindElement(unit);
   }
 
+  FindElement2 get findElement2 {
+    return FindElement2(unit);
+  }
+
   FindNode get findNode {
     return FindNode(content, unit);
   }

pkg/analyzer_plugin/test/src/utilities/completion/completion_target_test.dart

@@ -5,6 +5,7 @@
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/test_utilities/find_element_2.dart';
 import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -888,6 +889,7 @@ class _Base extends AbstractContextTest {
   int? offset;
   late CompletionTarget target;
   late FindElement findElement;
+  late FindElement2 findElement2;
 
   void assertTarget(
     String entityText,
@@ -955,6 +957,7 @@ class _Base extends AbstractContextTest {
 
     var result = await resolveFile(path);
     findElement = FindElement(result.unit);
+    findElement2 = FindElement2(result.unit);
 
     target = CompletionTarget.forOffset(result.unit, offset!);
   }

pkg/analyzer_plugin/test/support/abstract_single_unit.dart

@@ -10,6 +10,7 @@ import 'package:analyzer/src/dart/ast/element_locator.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/test_utilities/find_element_2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:test/test.dart';
 
@@ -24,6 +25,7 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   late CompilationUnit testUnit;
   late FindNode findNode;
   late FindElement findElement;
+  late FindElement2 findElement2;
 
   void addTestSource(String code) {
     testCode = code;
@@ -119,6 +121,7 @@ class AbstractSingleUnitTest extends AbstractContextTest {
     }
     findNode = FindNode(testCode, testUnit);
     findElement = FindElement(testUnit);
+    findElement2 = FindElement2(testUnit);
   }
 
   @override

pkg/linter/test/rule_test_support.dart

@@ -17,6 +17,7 @@ import 'package:analyzer/src/lint/pub.dart';
 import 'package:analyzer/src/lint/registry.dart';
 import 'package:analyzer/src/lint/util.dart';
 import 'package:analyzer/src/test_utilities/find_element.dart';
+import 'package:analyzer/src/test_utilities/find_element_2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:analyzer/src/test_utilities/mock_sdk.dart';
 import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
@@ -510,6 +511,8 @@ abstract class _ContextResolutionTest
 
   late FindElement findElement;
 
+  late FindElement2 findElement2;
+
   late FindNode findNode;
 
   late ResolvedUnitResult result;
@@ -555,6 +558,7 @@ abstract class _ContextResolutionTest
     var result = await session.getResolvedUnit(path) as ResolvedUnitResult;
 
     findElement = FindElement(result.unit);
+    findElement2 = FindElement2(result.unit);
     findNode = FindNode(result.content, result.unit);
     return result;
   }