Skip to content

Commit a829a7e

Browse files
scheglovCommit Queue
authored andcommitted
Elements. Rename SearchEngine methods.
Change-Id: I3ffd1fe3e0983bd2dd0c76d37b3c9a2bb5969ec8 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/401042 Reviewed-by: Brian Wilkerson <[email protected]> Reviewed-by: Phil Quitslund <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 41ef3a1 commit a829a7e

22 files changed

+62
-65
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class DartLazyTypeHierarchyComputer {
133133
}
134134
}
135135

136-
var matches = await searchEngine.searchSubtypes2(
136+
var matches = await searchEngine.searchSubtypes(
137137
target,
138138
SearchEngineCache(),
139139
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class ImplementedComputer {
7474
}
7575

7676
// Analyze subtypes.
77-
subtypeMembers = await searchEngine.membersOfSubtypes2(element);
77+
subtypeMembers = await searchEngine.membersOfSubtypes(element);
7878
if (subtypeMembers != null) {
7979
_addImplementedClass(element);
8080
element.getters2.forEach(_addMemberIfImplemented);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class ImplementationHandler
7878
var allSubtypes = <InterfaceElement2>{};
7979
await performance.runAsync(
8080
'appendAllSubtypes',
81-
(performance) => server.searchEngine.appendAllSubtypes2(
81+
(performance) => server.searchEngine.appendAllSubtypes(
8282
interfaceElement,
8383
allSubtypes,
8484
performance,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ElementReferencesComputer {
7171
Future<List<SearchMatch>> _findSingleElementReferences(
7272
Element2 element,
7373
) async {
74-
return searchEngine.searchReferences2(element);
74+
return searchEngine.searchReferences(element);
7575
}
7676

7777
/// Returns a [Future] completing with [Element]s to search references to.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ class _SignatureUpdater {
970970
required ExecutableElement element,
971971
required ChangeBuilder builder,
972972
}) async {
973-
var references = await searchEngine.searchReferences2(element.asElement2);
973+
var references = await searchEngine.searchReferences(element.asElement2);
974974
for (var reference in references) {
975975
var unitResult = await referenceUnitResult(reference);
976976
if (unitResult == null) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class ConvertGetterToMethodRefactoringImpl extends RefactoringImpl
138138
}
139139

140140
Future<void> _updateElementReferences(Element2 element) async {
141-
var matches = await searchEngine.searchReferences2(element);
141+
var matches = await searchEngine.searchReferences(element);
142142
var references = getSourceReferences(matches);
143143
for (var reference in references) {
144144
// Don't update references in macro-generated files.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class ConvertMethodToGetterRefactoringImpl extends RefactoringImpl
138138
}
139139

140140
Future<void> _updateElementReferences(Element2 element) async {
141-
var matches = await searchEngine.searchReferences2(element);
141+
var matches = await searchEngine.searchReferences(element);
142142
var references = getSourceReferences(matches);
143143
for (var reference in references) {
144144
// Don't update references in macro-generated files.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
8888
return RefactoringStatus.fatal(message, newLocation_fromNode(node));
8989
}
9090
// prepare references
91-
var references = await searchEngine.searchReferences2(element);
91+
var references = await searchEngine.searchReferences(element);
9292
// should not have assignments
9393
for (var reference in references) {
9494
if (reference.kind != MatchKind.READ) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class InlineMethodRefactoringImpl extends RefactoringImpl
312312
// analyze method body
313313
result.addStatus(_prepareMethodParts());
314314
// process references
315-
var references = await searchEngine.searchReferences2(methodElement);
315+
var references = await searchEngine.searchReferences(methodElement);
316316
_referenceProcessors.clear();
317317
for (var reference in references) {
318318
var processor = _ReferenceProcessor(this, reference);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ class RenameProcessor {
7676
Future<void> renameElement(Element element) {
7777
addDeclarationEdit(element);
7878
return workspace.searchEngine
79-
.searchReferences2(element.asElement2!)
79+
.searchReferences(element.asElement2!)
8080
.then(addReferenceEdits);
8181
}
8282

8383
/// Update the [element] declaration and references to it.
8484
Future<void> renameElement2(Element2 element) async {
8585
addDeclarationEdit2(element);
86-
var matches = await workspace.searchEngine.searchReferences2(element);
86+
var matches = await workspace.searchEngine.searchReferences(element);
8787
addReferenceEdits(matches);
8888
}
8989

0 commit comments

Comments
 (0)