Version 3.7.0-258.0.dev

Merge e303f54 into dev

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

@@ -133,7 +133,7 @@ class DartLazyTypeHierarchyComputer {
       }
     }
 
-    var matches = await searchEngine.searchSubtypes2(
+    var matches = await searchEngine.searchSubtypes(
       target,
       SearchEngineCache(),
     );

pkg/analysis_server/lib/src/domains/analysis/implemented_dart.dart

@@ -74,7 +74,7 @@ class ImplementedComputer {
     }
 
     // Analyze subtypes.
-    subtypeMembers = await searchEngine.membersOfSubtypes2(element);
+    subtypeMembers = await searchEngine.membersOfSubtypes(element);
     if (subtypeMembers != null) {
       _addImplementedClass(element);
       element.getters2.forEach(_addMemberIfImplemented);

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

@@ -78,7 +78,7 @@ class ImplementationHandler
     var allSubtypes = <InterfaceElement2>{};
     await performance.runAsync(
       'appendAllSubtypes',
-      (performance) => server.searchEngine.appendAllSubtypes2(
+      (performance) => server.searchEngine.appendAllSubtypes(
         interfaceElement,
         allSubtypes,
         performance,

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

@@ -71,7 +71,7 @@ class ElementReferencesComputer {
   Future<List<SearchMatch>> _findSingleElementReferences(
     Element2 element,
   ) async {
-    return searchEngine.searchReferences2(element);
+    return searchEngine.searchReferences(element);
   }
 
   /// Returns a [Future] completing with [Element]s to search references to.

pkg/analysis_server/lib/src/services/refactoring/agnostic/change_method_signature.dart

@@ -970,7 +970,7 @@ class _SignatureUpdater {
     required ExecutableElement element,
     required ChangeBuilder builder,
   }) async {
-    var references = await searchEngine.searchReferences2(element.asElement2);
+    var references = await searchEngine.searchReferences(element.asElement2);
     for (var reference in references) {
       var unitResult = await referenceUnitResult(reference);
       if (unitResult == null) {

pkg/analysis_server/lib/src/services/refactoring/legacy/convert_getter_to_method.dart

@@ -138,7 +138,7 @@ class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
   }
 
   Future<void> _updateElementReferences(Element2 element) async {
-    var matches = await searchEngine.searchReferences2(element);
+    var matches = await searchEngine.searchReferences(element);
     var references = getSourceReferences(matches);
     for (var reference in references) {
       // Don't update references in macro-generated files.

pkg/analysis_server/lib/src/services/refactoring/legacy/convert_method_to_getter.dart

@@ -138,7 +138,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
   }
 
   Future<void> _updateElementReferences(Element2 element) async {
-    var matches = await searchEngine.searchReferences2(element);
+    var matches = await searchEngine.searchReferences(element);
     var references = getSourceReferences(matches);
     for (var reference in references) {
       // Don't update references in macro-generated files.

pkg/analysis_server/lib/src/services/refactoring/legacy/inline_local.dart

@@ -88,7 +88,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
       return RefactoringStatus.fatal(message, newLocation_fromNode(node));
     }
     // prepare references
-    var references = await searchEngine.searchReferences2(element);
+    var references = await searchEngine.searchReferences(element);
     // should not have assignments
     for (var reference in references) {
       if (reference.kind != MatchKind.READ) {

pkg/analysis_server/lib/src/services/refactoring/legacy/inline_method.dart

@@ -312,7 +312,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
     // analyze method body
     result.addStatus(_prepareMethodParts());
     // process references
-    var references = await searchEngine.searchReferences2(methodElement);
+    var references = await searchEngine.searchReferences(methodElement);
     _referenceProcessors.clear();
     for (var reference in references) {
       var processor = _ReferenceProcessor(this, reference);

pkg/analysis_server/lib/src/services/refactoring/legacy/rename.dart

@@ -76,14 +76,14 @@ class RenameProcessor {
   Future<void> renameElement(Element element) {
     addDeclarationEdit(element);
     return workspace.searchEngine
-        .searchReferences2(element.asElement2!)
+        .searchReferences(element.asElement2!)
         .then(addReferenceEdits);
   }
 
   /// Update the [element] declaration and references to it.
   Future<void> renameElement2(Element2 element) async {
     addDeclarationEdit2(element);
-    var matches = await workspace.searchEngine.searchReferences2(element);
+    var matches = await workspace.searchEngine.searchReferences(element);
     addReferenceEdits(matches);
   }
 

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart

@@ -111,7 +111,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
                 if (parameter is FieldFormalParameterElement2 &&
                     parameter.field2 == renameElement) {
                   await workspace.searchEngine
-                      .searchReferences2(parameter)
+                      .searchReferences(parameter)
                       .then(processor.addReferenceEdits);
                 }
               }
@@ -295,7 +295,7 @@ class _CreateClassMemberValidator extends _BaseClassMemberValidator {
     _checkClassAlreadyDeclares();
     // do chained computations
     var subClasses = <InterfaceElement2>{};
-    await searchEngine.appendAllSubtypes2(
+    await searchEngine.appendAllSubtypes(
       interfaceElement,
       subClasses,
       OperationPerformanceImpl('<root>'),
@@ -385,7 +385,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
     // do chained computations
     await _prepareReferences();
     var subClasses = <InterfaceElement2>{};
-    await searchEngine.appendAllSubtypes2(
+    await searchEngine.appendAllSubtypes(
       interfaceElement,
       subClasses,
       OperationPerformanceImpl('<root>'),
@@ -489,7 +489,7 @@ class _RenameClassMemberValidator extends _BaseClassMemberValidator {
   Future<void> _prepareReferences() async {
     await _prepareElements();
     await Future.forEach(elements, (Element2 element) async {
-      var elementReferences = await searchEngine.searchReferences2(element);
+      var elementReferences = await searchEngine.searchReferences(element);
       references.addAll(elementReferences);
     });
   }

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_constructor.dart

@@ -52,7 +52,7 @@ class RenameConstructorRefactoringImpl extends RenameRefactoringImpl {
   @override
   Future<void> fillChange() async {
     // prepare references
-    var matches = await searchEngine.searchReferences2(element2);
+    var matches = await searchEngine.searchReferences(element2);
     var references = getSourceReferences(matches);
     // update references
     for (var reference in references) {

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_extension_member.dart

@@ -206,7 +206,7 @@ class _ExtensionMemberValidator {
   Future<void> _prepareReferences() async {
     if (!isRename) return;
 
-    references.addAll(await searchEngine.searchReferences2(element));
+    references.addAll(await searchEngine.searchReferences(element));
   }
 }
 

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_local.dart

@@ -195,7 +195,7 @@ class RenameLocalRefactoringImpl extends RenameRefactoringImpl {
       processor.addDeclarationEdit2(element);
     }
 
-    var references = await searchEngine.searchReferences2(element);
+    var references = await searchEngine.searchReferences(element);
     processor.addReferenceEdits(references);
   }
 }

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_parameter.dart

@@ -82,7 +82,7 @@ class RenameParameterRefactoringImpl extends RenameRefactoringImpl {
       if (!fieldRenamed) {
         processor.addDeclarationEdit2(element);
       }
-      var references = await searchEngine.searchReferences2(element);
+      var references = await searchEngine.searchReferences(element);
 
       // Remove references that don't have to have the same name.
 

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_type_parameter.dart

@@ -53,7 +53,7 @@ class RenameTypeParameterRefactoringImpl extends RenameRefactoringImpl {
     var processor = RenameProcessor(workspace, sessionHelper, change, newName);
     processor.addDeclarationEdit2(element2);
 
-    var references = await searchEngine.searchReferences2(element2);
+    var references = await searchEngine.searchReferences(element2);
     processor.addReferenceEdits(references);
   }
 }

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_unit_member.dart

@@ -248,7 +248,7 @@ class _BaseUnitMemberValidator {
     for (var declaration in declarations) {
       var member = declaration.element2;
       var declaringClass = member.enclosingElement2 as InterfaceElement2;
-      var memberReferences = await searchEngine.searchReferences2(member);
+      var memberReferences = await searchEngine.searchReferences(member);
       for (var memberReference in memberReferences) {
         var refElement = memberReference.element2;
         // cannot be shadowed if qualified
@@ -308,7 +308,7 @@ class _RenameUnitMemberValidator extends _BaseUnitMemberValidator {
 
   Future<RefactoringStatus> validate() async {
     _validateWillConflict();
-    references = await searchEngine.searchReferences2(element);
+    references = await searchEngine.searchReferences(element);
     _validateWillBeInvisible();
     _validateWillBeShadowed();
     await _validateWillShadow(element);

pkg/analysis_server/lib/src/services/refactoring/move_top_level_to_file.dart

@@ -153,7 +153,7 @@ class MoveTopLevelToFile extends RefactoringProducer {
     var libraries = <LibraryElement2, Set<Element2>>{};
     for (var element2 in analyzer.movingDeclarations) {
       var element = element2;
-      var matches = await searchEngine.searchReferences2(element);
+      var matches = await searchEngine.searchReferences(element);
       for (var match in matches) {
         if (match.isResolved) {
           libraries.putIfAbsent(match.libraryElement2, () => {}).add(element2);
@@ -168,7 +168,7 @@ class MoveTopLevelToFile extends RefactoringProducer {
       var library = entry.key;
       var prefixes = <String>{};
       for (var element in entry.value) {
-        var prefixList = await searchEngine.searchPrefixesUsedInLibrary2(
+        var prefixList = await searchEngine.searchPrefixesUsedInLibrary(
           library,
           element,
         );

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

@@ -55,7 +55,7 @@ Future<Set<InterfaceElement2>> getDirectSubClasses(
   InterfaceElement2 seed,
   SearchEngineCache searchEngineCache,
 ) async {
-  var matches = await searchEngine.searchSubtypes2(seed, searchEngineCache);
+  var matches = await searchEngine.searchSubtypes(seed, searchEngineCache);
   return matches
       .map((match) => match.element2)
       .cast<InterfaceElement2>()
@@ -157,11 +157,8 @@ getHierarchyMembersAndParameters(
       // check all sub- classes
       await performance.runAsync(
         'appendAllSubtypes',
-        (performance) => searchEngine.appendAllSubtypes2(
-          superClass,
-          subClasses,
-          performance,
-        ),
+        (performance) =>
+            searchEngine.appendAllSubtypes(superClass, subClasses, performance),
       );
       subClasses.add(superClass);
     }

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

@@ -79,7 +79,7 @@ abstract class SearchEngine {
   ///
   /// If [allSubtypes] already contains an element it is assumed that it
   /// contains the entire subtree and the element won't be search on further.
-  Future<void> appendAllSubtypes2(
+  Future<void> appendAllSubtypes(
     InterfaceElement2 type,
     Set<InterfaceElement2> allSubtypes,
     OperationPerformanceImpl performance,
@@ -88,7 +88,7 @@ abstract class SearchEngine {
   /// If the [type] has subtypes, return the set of names of members which these
   /// subtypes declare, possibly empty.  If the [type] does not have subtypes,
   /// return `null`.
-  Future<Set<String>?> membersOfSubtypes2(InterfaceElement2 type);
+  Future<Set<String>?> membersOfSubtypes(InterfaceElement2 type);
 
   /// Returns references to the given [fragment].
   Future<List<LibraryFragmentSearchMatch>> searchLibraryFragmentReferences(
@@ -114,20 +114,20 @@ abstract class SearchEngine {
   /// Return the prefixes used to reference the [element] in any of the
   /// compilation units in the [library]. The returned set will include an empty
   /// string if the element is referenced without a prefix.
-  Future<Set<String>> searchPrefixesUsedInLibrary2(
+  Future<Set<String>> searchPrefixesUsedInLibrary(
     LibraryElement2 library,
     Element2 element,
   );
 
   /// Returns references to the given [element].
-  Future<List<SearchMatch>> searchReferences2(Element2 element);
+  Future<List<SearchMatch>> searchReferences(Element2 element);
 
   /// Returns direct subtypes of the given [type].
   ///
   /// [type] - the [InterfaceElement2] being subtyped by the found matches.
   /// [cache] - the [SearchEngineCache] used to speeding up the computation. If
   ///    empty it will be filled out and can be used on any subsequent query.
-  Future<List<SearchMatch>> searchSubtypes2(
+  Future<List<SearchMatch>> searchSubtypes(
     InterfaceElement2 type,
     SearchEngineCache cache, {
     OperationPerformanceImpl? performance,

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

@@ -19,7 +19,7 @@ class SearchEngineImpl implements SearchEngine {
   SearchEngineImpl(this._drivers);
 
   @override
-  Future<void> appendAllSubtypes2(
+  Future<void> appendAllSubtypes(
     InterfaceElement2 type,
     Set<InterfaceElement2> allSubtypes,
     OperationPerformanceImpl performance,
@@ -44,7 +44,7 @@ class SearchEngineImpl implements SearchEngine {
   }
 
   @override
-  Future<Set<String>?> membersOfSubtypes2(InterfaceElement2 type) async {
+  Future<Set<String>?> membersOfSubtypes(InterfaceElement2 type) async {
     var drivers = _drivers.toList();
     var searchedFiles = _createSearchedFiles(drivers);
 
@@ -144,7 +144,7 @@ class SearchEngineImpl implements SearchEngine {
   }
 
   @override
-  Future<Set<String>> searchPrefixesUsedInLibrary2(
+  Future<Set<String>> searchPrefixesUsedInLibrary(
     covariant LibraryElementImpl library,
     Element2 element,
   ) async {
@@ -154,7 +154,7 @@ class SearchEngineImpl implements SearchEngine {
   }
 
   @override
-  Future<List<SearchMatch>> searchReferences2(Element2 element) async {
+  Future<List<SearchMatch>> searchReferences(Element2 element) async {
     var allResults = <SearchResult>[];
     var drivers = _drivers.toList();
     var searchedFiles = _createSearchedFiles(drivers);
@@ -166,7 +166,7 @@ class SearchEngineImpl implements SearchEngine {
   }
 
   @override
-  Future<List<SearchMatch>> searchSubtypes2(
+  Future<List<SearchMatch>> searchSubtypes(
     InterfaceElement2 type,
     SearchEngineCache searchEngineCache, {
     OperationPerformanceImpl? performance,