[migration] search_find_element_references.dart

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

Author: bwilkerson

pkg/analysis_server/lib/src/analysis_server.dart

@@ -646,10 +646,10 @@ abstract class AnalysisServer {
   /// Gets the current version number of a document (if known).
   int? getDocumentVersion(String path);
 
-  /// Return a [Future] that completes with the [Element] at the given
+  /// Return a [Future] that completes with the [Element2] at the given
   /// [offset] of the given [file], or with `null` if there is no node at the
   /// [offset] or the node does not have an element.
-  Future<Element?> getElementAtOffset(String file, int offset) async {
+  Future<Element2?> getElementAtOffset2(String file, int offset) async {
     if (!priorityFiles.contains(file)) {
       var driver = getAnalysisDriver(file);
       if (driver == null) {
@@ -661,22 +661,19 @@ abstract class AnalysisServer {
         return null;
       }
 
-      var element = findElementByNameOffset(unitElementResult.element, offset);
-      if (element != null) {
-        return element;
+      var fragment = findFragmentByNameOffset(
+        unitElementResult.fragment,
+        offset,
+      );
+      if (fragment != null) {
+        return fragment.element;
       }
     }
 
     var node = await getNodeAtOffset(file, offset);
-    return getElementOfNode(node);
+    return getElementOfNode2(node);
   }
 
-  /// Return a [Future] that completes with the [Element2] at the given
-  /// [offset] of the given [file], or with `null` if there is no node at the
-  /// [offset] or the node does not have an element.
-  Future<Element2?> getElementAtOffset2(String file, int offset) async =>
-      (await getElementAtOffset(file, offset)).asElement2;
-
   /// Return the [Element] of the given [node], or `null` if [node] is `null` or
   /// does not have an element.
   Element? getElementOfNode(AstNode? node) {

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

@@ -2,17 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: analyzer_use_new_elements
-
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol_dart.dart' as protocol;
 import 'package:analysis_server/protocol/protocol_generated.dart' as protocol;
 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';
+import 'package:analyzer/dart/element/element2.dart';
 
 /// The handler for the `search.findElementReferences` request.
 class SearchFindElementReferencesHandler extends LegacyHandler {
@@ -34,31 +31,25 @@ class SearchFindElementReferencesHandler extends LegacyHandler {
     );
     var file = params.file;
     // prepare element
-    var element = await server.getElementAtOffset(file, params.offset);
-    if (element is LibraryImportElement) {
-      element = element.prefix?.element;
-    }
-    if (element is FieldFormalParameterElement) {
-      element = element.field;
+    var element = await server.getElementAtOffset2(file, params.offset);
+    if (element is FieldFormalParameterElement2) {
+      element = element.field2;
     }
-    if (element is PropertyAccessorElement) {
-      element = element.variable2;
+    if (element is PropertyAccessorElement2) {
+      element = element.variable3;
     }
     // respond
     var searchId = (server.nextSearchId++).toString();
     var result = protocol.SearchFindElementReferencesResult();
     if (element != null) {
       result.id = searchId;
-      result.element = protocol.convertElement(element.asElement2!);
+      result.element = protocol.convertElement(element);
     }
     sendResult(result);
     // search elements
     if (element != null) {
       var computer = ElementReferencesComputer(searchEngine);
-      var results = await computer.compute(
-        element.asElement2!,
-        params.includePotential,
-      );
+      var results = await computer.compute(element, params.includePotential);
       sendSearchResults(
         protocol.SearchResultsParams(
           searchId,

pkg/analysis_server/lib/src/services/search/element_visitors.dart

@@ -8,7 +8,6 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/visitor.dart';
 import 'package:analyzer/dart/element/visitor2.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Return the [Element] that is either [root], or one of its direct or
 /// indirect children, and has the given [nameOffset].
@@ -25,10 +24,11 @@ Element? findElementByNameOffset(Element? root, int nameOffset) {
   return null;
 }
 
-/// Return the [Element2] that is either [root], or one of its direct or
+/// Returns the fragment that is either [fragment], or one of its direct or
 /// indirect children, and has the given [nameOffset].
-Element2? findElementByNameOffset2(Element2? root, int nameOffset) =>
-    findElementByNameOffset(root.asElement, nameOffset).asElement2;
+Fragment? findFragmentByNameOffset(LibraryFragment fragment, int nameOffset) {
+  return _FragmentByNameOffsetVisitor(nameOffset).search(fragment);
+}
 
 /// Uses [processor] to visit all of the children of [element].
 /// If [processor] returns `true`, then children of a child are visited too.
@@ -108,6 +108,28 @@ class _ElementVisitorAdapter2 extends GeneralizingElementVisitor2<void> {
   }
 }
 
+/// A visitor that finds the deep-most fragment that contains the [nameOffset].
+class _FragmentByNameOffsetVisitor {
+  final int nameOffset;
+
+  _FragmentByNameOffsetVisitor(this.nameOffset);
+
+  Fragment? search(LibraryFragment fragment) => _searchIn(fragment);
+
+  Fragment? _searchIn(Fragment fragment) {
+    if (fragment.nameOffset2 == nameOffset) {
+      return fragment;
+    }
+    for (var child in fragment.children3) {
+      var result = _searchIn(child);
+      if (result != null) {
+        return result;
+      }
+    }
+    return null;
+  }
+}
+
 /// A [GeneralizingElementVisitor] for visiting top-level elements.
 class _TopLevelElementsVisitor extends GeneralizingElementVisitor<void> {
   final VoidElementProcessor processor;

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

@@ -17,7 +17,7 @@ void main() {
 
 @reflectiveTest
 class FindElementByNameOffsetTest extends AbstractSingleUnitTest {
-  Element2 get testUnitElement => testLibraryElement;
+  LibraryFragment get testUnitFragment => testUnit.declaredFragment!;
 
   Future<void> test_class() async {
     await resolveTestCode(r'''
@@ -42,13 +42,12 @@ void bbb() {}
 class AAA {}
 class BBB {}
 ''');
-    expect(findElementByNameOffset2(null, 0), isNull);
 
-    expect(findElementByNameOffset2(testUnitElement, 0), isNull);
-    expect(findElementByNameOffset2(testUnitElement, 1), isNull);
+    expect(findFragmentByNameOffset(testUnitFragment, 0), isNull);
+    expect(findFragmentByNameOffset(testUnitFragment, 1), isNull);
 
-    expect(findElementByNameOffset2(testUnitElement, 5), isNull);
-    expect(findElementByNameOffset2(testUnitElement, 7), isNull);
+    expect(findFragmentByNameOffset(testUnitFragment, 5), isNull);
+    expect(findFragmentByNameOffset(testUnitFragment, 7), isNull);
   }
 
   Future<void> test_topLevelVariable() async {
@@ -62,8 +61,8 @@ int? ccc;
   }
 
   void _assertElement(int nameOffset, ElementKind kind, String name) {
-    var element = findElementByNameOffset2(testUnitElement, nameOffset)!;
-    expect(element.kind, kind);
-    expect(element.name3, name);
+    var fragment = findFragmentByNameOffset(testUnitFragment, nameOffset)!;
+    expect(fragment.element.kind, kind);
+    expect(fragment.name2, name);
   }
 }