Elements. Remove FindElement fields where possible.

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

Author: scheglov

pkg/analysis_server/test/abstract_single_unit.dart

@@ -8,7 +8,6 @@ import 'package:analyzer/dart/element/element2.dart';
 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_element2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:analyzer/src/utilities/extensions/analysis_session.dart';
@@ -25,7 +24,6 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   late ResolvedUnitResult testAnalysisResult;
   late CompilationUnit testUnit;
   late FindNode findNode;
-  late FindElement findElement;
   late FindElement2 findElement2;
 
   late LibraryElement2 testLibraryElement;
@@ -52,7 +50,6 @@ class AbstractSingleUnitTest extends AbstractContextTest {
     testCode = unitResult.content;
     testUnit = unitResult.unit;
     findNode = FindNode(testCode, testUnit);
-    findElement = FindElement(testUnit);
     findElement2 = FindElement2(testUnit);
     return unitResult;
   }
@@ -83,7 +80,6 @@ class AbstractSingleUnitTest extends AbstractContextTest {
 
     testLibraryElement = testUnit.declaredFragment!.element;
     findNode = FindNode(testCode, testUnit);
-    findElement = FindElement(testUnit);
     findElement2 = FindElement2(testUnit);
     return testAnalysisResult;
   }

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

@@ -7,7 +7,6 @@ import 'package:analysis_server/src/services/search/search_engine_internal.dart'
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/element/element2.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_element2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
@@ -30,7 +29,6 @@ void main() {
 class PubPackageResolutionTest extends AbstractContextTest {
   late ResolvedUnitResult result;
   late FindNode findNode;
-  late FindElement findElement;
   late FindElement2 findElement2;
 
   void addTestFile(String content) {
@@ -42,7 +40,6 @@ class PubPackageResolutionTest extends AbstractContextTest {
     result = await getResolvedUnit(file);
 
     findNode = FindNode(result.content, result.unit);
-    findElement = FindElement(result.unit);
     findElement2 = FindElement2(result.unit);
   }
 

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

@@ -485,10 +485,6 @@ mixin ResolutionTest implements ResourceProviderMixin {
 }
 
 extension ResolvedUnitResultExtension on ResolvedUnitResult {
-  FindElement get findElement {
-    return FindElement(unit);
-  }
-
   FindElement2 get findElement2 {
     return FindElement2(unit);
   }

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

@@ -4,7 +4,6 @@
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element2.dart';
-import 'package:analyzer/src/test_utilities/find_element.dart';
 import 'package:analyzer/src/test_utilities/find_element2.dart';
 import 'package:analyzer_plugin/src/utilities/completion/completion_target.dart';
 import 'package:test/test.dart';
@@ -888,7 +887,6 @@ class C2 {
 class _Base extends AbstractContextTest {
   int? offset;
   late CompletionTarget target;
-  late FindElement findElement;
   late FindElement2 findElement2;
 
   void assertTarget(
@@ -956,7 +954,6 @@ class _Base extends AbstractContextTest {
     newFile(path, content);
 
     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

@@ -9,7 +9,6 @@ import 'package:analyzer/error/error.dart';
 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_element2.dart';
 import 'package:analyzer/src/test_utilities/find_node.dart';
 import 'package:test/test.dart';
@@ -24,7 +23,6 @@ class AbstractSingleUnitTest extends AbstractContextTest {
   late String testFile;
   late CompilationUnit testUnit;
   late FindNode findNode;
-  late FindElement findElement;
   late FindElement2 findElement2;
 
   void addTestSource(String code) {
@@ -120,7 +118,6 @@ class AbstractSingleUnitTest extends AbstractContextTest {
       }), isEmpty);
     }
     findNode = FindNode(testCode, testUnit);
-    findElement = FindElement(testUnit);
     findElement2 = FindElement2(testUnit);
   }