Migrate ElementReferencesComputer

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

Author: bwilkerson

pkg/analysis_server/analyzer_use_new_elements.txt

@@ -12,7 +12,6 @@ lib/src/lsp/handlers/handler_definition.dart
 lib/src/lsp/handlers/handler_references.dart
 lib/src/lsp/handlers/handler_rename.dart
 lib/src/protocol_server.dart
-lib/src/search/element_references.dart
 lib/src/services/correction/namespace.dart
 lib/src/services/kythe/kythe_visitors.dart
 lib/src/services/refactoring/agnostic/change_method_signature.dart

pkg/analysis_server/lib/src/computer/computer_call_hierarchy.dart

@@ -12,6 +12,7 @@ import 'package:analyzer/source/source_range.dart';
 import 'package:analyzer/src/dart/ast/element_locator.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/dart/element/element.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Returns the container for [element] that should be used in Call Hierarchy.
 ///
@@ -221,7 +222,7 @@ class DartCallHierarchyComputer {
     }
 
     var computer = ElementReferencesComputer(searchEngine);
-    var references = await computer.compute(element, false);
+    var references = await computer.compute(element.asElement2, false);
 
     // Group results by their container, since we only want to return a single
     // entry for a body, with a set of ranges within.

pkg/analysis_server/lib/src/handler/legacy/search_find_element_references.dart

@@ -10,6 +10,7 @@ import 'package:analysis_server/src/handler/legacy/legacy_handler.dart';
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/search/element_references.dart';
 import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// The handler for the `search.findElementReferences` request.
 class SearchFindElementReferencesHandler extends LegacyHandler {
@@ -52,7 +53,10 @@ class SearchFindElementReferencesHandler extends LegacyHandler {
     // search elements
     if (element != null) {
       var computer = ElementReferencesComputer(searchEngine);
-      var results = await computer.compute(element, params.includePotential);
+      var results = await computer.compute(
+        element.asElement2!,
+        params.includePotential,
+      );
       sendSearchResults(
         protocol.SearchResultsParams(
           searchId,

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

@@ -15,6 +15,7 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/dart/ast/utilities.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
+import 'package:analyzer/src/utilities/extensions/element.dart';
 
 typedef StaticOptions = Either2<bool, ReferenceOptions>;
 
@@ -90,10 +91,17 @@ class ReferencesHandler
 
     var computer = ElementReferencesComputer(server.searchEngine);
     var session = element.session ?? result.session;
+    var element2 =
+        element is LibraryImportElement
+            ? element.prefix?.element.asElement2
+            : element.asElement2;
+    if (element2 == null) {
+      return success(null);
+    }
     var results = await performance.runAsync(
       'computer.compute',
       (childPerformance) =>
-          computer.compute(element, false, performance: childPerformance),
+          computer.compute(element2, false, performance: childPerformance),
     );
 
     Location? toLocation(SearchMatch result) {

pkg/analysis_server/lib/src/search/element_references.dart

@@ -6,9 +6,8 @@ import 'package:analysis_server/src/protocol_server.dart'
     show SearchResult, newSearchResult_fromMatch;
 import 'package:analysis_server/src/services/search/hierarchy.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
-import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/src/util/performance/operation_performance.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// A computer for `search.findElementReferences` request results.
 class ElementReferencesComputer {
@@ -18,7 +17,7 @@ class ElementReferencesComputer {
 
   /// Computes [SearchMatch]es for [element] references.
   Future<List<SearchMatch>> compute(
-    Element element,
+    Element2 element,
     bool withPotential, {
     OperationPerformanceImpl? performance,
   }) async {
@@ -50,7 +49,7 @@ class ElementReferencesComputer {
   /// Returns a [Future] completing with a [List] of references to [element] or
   /// to the corresponding hierarchy [Element]s.
   Future<List<SearchMatch>> _findElementsReferences(
-    Element element,
+    Element2 element,
     OperationPerformanceImpl performance,
   ) async {
     var allResults = <SearchMatch>[];
@@ -70,9 +69,9 @@ class ElementReferencesComputer {
 
   /// Returns a [Future] completing with a [List] of references to [element].
   Future<List<SearchMatch>> _findSingleElementReferences(
-    Element element,
+    Element2 element,
   ) async {
-    return searchEngine.searchReferences(element);
+    return searchEngine.searchReferences2(element);
   }
 
   /// Returns a [Future] completing with [Element]s to search references to.
@@ -81,31 +80,30 @@ class ElementReferencesComputer {
   /// corresponding [Element] in the hierarchy is returned.
   ///
   /// Otherwise, only references to [element] should be searched.
-  Future<Iterable<Element>> _getRefElements(
-    Element element,
+  Future<Iterable<Element2>> _getRefElements(
+    Element2 element,
     OperationPerformanceImpl performance,
   ) async {
-    if (element is ParameterElement && element.isNamed) {
-      return (await performance.runAsync(
+    if (element is FormalParameterElement && element.isNamed) {
+      return await performance.runAsync(
         'getHierarchyNamedParameters',
-        (_) => getHierarchyNamedParameters(searchEngine, element.asElement2),
-      )).map((e) => e.asElement);
+        (_) => getHierarchyNamedParameters(searchEngine, element),
+      );
     }
-    if (element is ClassMemberElement) {
+    if (element is MethodElement2 ||
+        element is FieldElement2 ||
+        element is ConstructorElement2) {
       var (members, parameters) = await performance.runAsync(
         'getHierarchyMembers',
         (performance) => getHierarchyMembersAndParameters(
           searchEngine,
-          element.asElement2!,
+          element,
           performance: performance,
           includeParametersForFields: true,
         ),
       );
 
-      return {
-        ...members.map((e) => e.asElement!),
-        ...parameters.map((e) => e.asElement),
-      };
+      return {...members.map((e) => e), ...parameters.map((e) => e)};
     }
     return [element];
   }
@@ -114,10 +112,10 @@ class ElementReferencesComputer {
     return newSearchResult_fromMatch(match);
   }
 
-  static bool _isMemberElement(Element element) {
-    if (element is ConstructorElement) {
+  static bool _isMemberElement(Element2 element) {
+    if (element is ConstructorElement2) {
       return false;
     }
-    return element.enclosingElement3 is InterfaceElement;
+    return element.enclosingElement2 is InterfaceElement2;
   }
 }

pkg/analysis_server/test/lsp/references_test.dart

@@ -81,7 +81,7 @@ class MyClass {
 void f() {
   MyClass()./*[0*/field/*0]*/ = '';
   print(MyClass()./*[1*/field/*1]*/);
-  
+
   var myInstance = MyClass();
   myInstance./*[2*/field/*2]*/ = '';
   print(myInstance./*[3*/field/*3]*/);
@@ -167,7 +167,7 @@ class MyClass {
 void f() {
   MyClass()./*[0*/field/*0]*/ = '';
   print(MyClass()./*[1*/field/*1]*/);
-  
+
   var myInstance = MyClass();
   myInstance./*[2*/field/*2]*/ = '';
   print(myInstance./*[3*/field/*3]*/);
@@ -188,7 +188,7 @@ class MyClass {
 void f() {
   MyClass()./*[0*/field/*0]*/ = '';
   print(MyClass()./*[1*/fi^eld/*1]*/);
-  
+
   var myInstance = MyClass();
   myInstance./*[2*/field/*2]*/ = '';
   print(myInstance./*[3*/field/*3]*/);
@@ -203,8 +203,8 @@ void f() {
     var content = '''
 imp^ort 'dart:async' as async;
 
-/*[0*/async./*0]*/Future<String>? f() {}
-/*[1*/async./*1]*/Future<String>? g() {}
+/*[0*/async/*0]*/.Future<String>? f() {}
+/*[1*/async/*1]*/.Future<String>? g() {}
 ''';
 
     await _checkRanges(content);
@@ -370,7 +370,7 @@ class MyClass {
 void f() {
   MyClass()./*[0*/field/*0]*/ = '';
   print(MyClass()./*[1*/field/*1]*/);
-  
+
   var myInstance = MyClass();
   myInstance./*[2*/field/*2]*/ = '';
   print(myInstance./*[3*/field/*3]*/);
@@ -391,7 +391,7 @@ class MyClass {
 void f() {
   MyClass()./*[0*/fie^ld/*0]*/ = '';
   print(MyClass()./*[1*/field/*1]*/);
-  
+
   var myInstance = MyClass();
   myInstance./*[2*/field/*2]*/ = '';
   print(myInstance./*[3*/field/*3]*/);