rename `resolve2` to `resolve`
Not sure if there's a good reason to keep this as `resolve2` since there's no simpler `resolve` to be found. If there is, please let me know and I can revert this and add a doc to `resolve2` for clarification.
Change-Id: I67c3825e9db95ec3f3c618f08664ed655394c041
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/344460
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Phil Quitslund <pquitslund@google.com>
diff --git a/pkg/analysis_server/lib/src/cider/assists.dart b/pkg/analysis_server/lib/src/cider/assists.dart
index 76a0d6b..36a05cf 100644
--- a/pkg/analysis_server/lib/src/cider/assists.dart
+++ b/pkg/analysis_server/lib/src/cider/assists.dart
@@ -21,7 +21,7 @@
Future<List<Assist>> compute(
String path, int lineNumber, int colNumber, int length) async {
var result = <Assist>[];
- var resolvedUnit = await _fileResolver.resolve2(path: path);
+ var resolvedUnit = await _fileResolver.resolve(path: path);
var lineInfo = resolvedUnit.lineInfo;
var offset = lineInfo.getOffsetOfLine(lineNumber) + colNumber;
diff --git a/pkg/analysis_server/lib/src/cider/document_symbols.dart b/pkg/analysis_server/lib/src/cider/document_symbols.dart
index 0e6fe0e..0e4b0c5 100644
--- a/pkg/analysis_server/lib/src/cider/document_symbols.dart
+++ b/pkg/analysis_server/lib/src/cider/document_symbols.dart
@@ -17,7 +17,7 @@
Future<List<DocumentSymbol>> compute2(String filePath) async {
var result = <DocumentSymbol>[];
- var resolvedUnit = await _fileResolver.resolve2(path: filePath);
+ var resolvedUnit = await _fileResolver.resolve(path: filePath);
final computer = DartUnitOutlineComputer(resolvedUnit);
final outline = computer.compute();
diff --git a/pkg/analysis_server/lib/src/cider/fixes.dart b/pkg/analysis_server/lib/src/cider/fixes.dart
index b2cbecf0..f5ba65e 100644
--- a/pkg/analysis_server/lib/src/cider/fixes.dart
+++ b/pkg/analysis_server/lib/src/cider/fixes.dart
@@ -41,7 +41,7 @@
/// Compute quick fixes for errors on the line with the [offset].
Future<List<CiderErrorFixes>> compute(String path, int lineNumber) async {
var result = <CiderErrorFixes>[];
- var resolvedUnit = await _fileResolver.resolve2(path: path);
+ var resolvedUnit = await _fileResolver.resolve(path: path);
var lineInfo = resolvedUnit.lineInfo;
diff --git a/pkg/analysis_server/lib/src/cider/rename.dart b/pkg/analysis_server/lib/src/cider/rename.dart
index d0a1000..d7816bc 100644
--- a/pkg/analysis_server/lib/src/cider/rename.dart
+++ b/pkg/analysis_server/lib/src/cider/rename.dart
@@ -215,8 +215,7 @@
element.setter!.nameLength));
}
} else if (element is LibraryImportElement) {
- var unit =
- (await canRename._fileResolver.resolve2(path: sourcePath)).unit;
+ var unit = (await canRename._fileResolver.resolve(path: sourcePath)).unit;
var index = element.library.libraryImports.indexOf(element);
var node = unit.directives.whereType<ImportDirective>().elementAt(index);
final prefixNode = node.prefix;
@@ -240,7 +239,7 @@
}
}
} else {
- var location = (await canRename._fileResolver.resolve2(path: sourcePath))
+ var location = (await canRename._fileResolver.resolve(path: sourcePath))
.lineInfo
.getLocation(element.nameOffset);
infos.add(ReplaceInfo(newName, location, element.nameLength));
@@ -281,7 +280,7 @@
/// it. Otherwise return `null`.
Future<SimpleIdentifier?> _getInterpolationIdentifier(
String path, CharacterLocation loc) async {
- var resolvedUnit = await canRename._fileResolver.resolve2(path: path);
+ var resolvedUnit = await canRename._fileResolver.resolve(path: path);
var lineInfo = resolvedUnit.lineInfo;
var node = NodeLocator(
lineInfo.getOffsetOfLine(loc.lineNumber - 1) + loc.columnNumber)
@@ -350,7 +349,7 @@
/// [filePath] can be renamed.
Future<CanRenameResponse?> canRename2(
String filePath, int line, int column) async {
- var resolvedUnit = await _fileResolver.resolve2(path: filePath);
+ var resolvedUnit = await _fileResolver.resolve(path: filePath);
var lineInfo = resolvedUnit.lineInfo;
var offset = lineInfo.getOffsetOfLine(line) + column;
diff --git a/pkg/analysis_server/lib/src/cider/signature_help.dart b/pkg/analysis_server/lib/src/cider/signature_help.dart
index d6fc27a..8d303ac 100644
--- a/pkg/analysis_server/lib/src/cider/signature_help.dart
+++ b/pkg/analysis_server/lib/src/cider/signature_help.dart
@@ -17,7 +17,7 @@
Future<SignatureHelpResponse?> compute2(
String filePath, int line, int column) async {
- var resolvedUnit = await _fileResolver.resolve2(path: filePath);
+ var resolvedUnit = await _fileResolver.resolve(path: filePath);
var lineInfo = resolvedUnit.lineInfo;
var offset = lineInfo.getOffsetOfLine(line) + column;
final formats = <MarkupKind>{MarkupKind.Markdown};
diff --git a/pkg/analysis_server/test/src/cider/fixes_test.dart b/pkg/analysis_server/test/src/cider/fixes_test.dart
index 8eac9aa2..c51a5b5 100644
--- a/pkg/analysis_server/test/src/cider/fixes_test.dart
+++ b/pkg/analysis_server/test/src/cider/fixes_test.dart
@@ -76,7 +76,7 @@
var a = newFile('/workspace/dart/test/lib/a.dart', r'''
class Test {}
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
await _compute(r'''
void f(Test a) {}^
@@ -93,7 +93,7 @@
var a = newFile('/workspace/dart/test/lib/a.dart', r'''
enum Test {a, b, c}
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
await _compute(r'''
void f(Test a) {}^
@@ -112,7 +112,7 @@
void foo() {}
}
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
await _compute(r'''
void f() {
@@ -133,7 +133,7 @@
var a = newFile('/workspace/dart/test/lib/a.dart', r'''
void foo() {}
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
await _compute(r'''
void f() {
@@ -154,7 +154,7 @@
var a = newFile('/workspace/dart/test/lib/a.dart', r'''
mixin Test {}
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
await _compute(r'''
void f(Test a) {}^
@@ -171,7 +171,7 @@
var a = newFile('/workspace/dart/test/lib/a.dart', r'''
var a = 0;
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
await _compute(r'''
void f() {
diff --git a/pkg/analysis_server/test/src/cider/rename_test.dart b/pkg/analysis_server/test/src/cider/rename_test.dart
index eb90fe3..6d772a8 100644
--- a/pkg/analysis_server/test/src/cider/rename_test.dart
+++ b/pkg/analysis_server/test/src/cider/rename_test.dart
@@ -636,7 +636,7 @@
var a = newFile('/workspace/dart/test/lib/a.dart', r'''
foo() {}
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
var result = await _rename(r'''
import 'a.dart';
void f() {
@@ -797,7 +797,7 @@
foo() {}
}
''');
- await fileResolver.resolve2(path: a.path);
+ await fileResolver.resolve(path: a.path);
var result = await _rename(r'''
import 'a.dart';
void f() {
diff --git a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
index 138173a..b84f8d9 100644
--- a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
+++ b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
@@ -172,7 +172,7 @@
@override
Future<SomeResolvedUnitResult> getResolvedUnit(String path) async {
- return analysisContext.fileResolver.resolve2(path: path);
+ return analysisContext.fileResolver.resolve(path: path);
}
@override
diff --git a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
index 13bf6fb..ba10900 100644
--- a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
+++ b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
@@ -268,7 +268,7 @@
Future<void> collectReferences2(
String path, OperationPerformanceImpl performance) async {
await performance.runAsync('collectReferences', (_) async {
- var resolved = await resolve2(path: path);
+ var resolved = await resolve(path: path);
var collector = ReferencesCollector(element);
resolved.unit.accept(collector);
var matches = collector.references;
@@ -334,7 +334,7 @@
return ErrorEncoding.decode(file.source, error)!;
}).toList();
} else {
- var unitResult = await resolve2(
+ var unitResult = await resolve(
path: path,
performance: performance,
);
@@ -524,7 +524,7 @@
releaseAndClearRemovedIds();
}
- Future<ResolvedUnitResult> resolve2({
+ Future<ResolvedUnitResult> resolve({
required String path,
OperationPerformanceImpl? performance,
}) async {
@@ -558,6 +558,14 @@
});
}
+ // TODO(pq): remove after cider extensions are updated.
+ Future<ResolvedUnitResult> resolve2({
+ required String path,
+ OperationPerformanceImpl? performance,
+ }) async {
+ return resolve(path: path, performance: performance);
+ }
+
/// The [completionLine] and [completionColumn] are zero based.
Future<ResolvedForCompletionResultImpl> resolveForCompletion({
required int completionLine,
@@ -864,7 +872,7 @@
LibraryElement libraryElement = element.library;
for (CompilationUnitElement unitElement in libraryElement.units) {
String unitPath = unitElement.source.fullName;
- var unitResult = await resolve2(path: unitPath);
+ var unitResult = await resolve(path: unitPath);
var visitor = ImportElementReferencesVisitor(element, unitElement);
unitResult.unit.accept(visitor);
var lineInfo = unitResult.lineInfo;
diff --git a/pkg/analyzer/test/src/dart/micro/file_resolution.dart b/pkg/analyzer/test/src/dart/micro/file_resolution.dart
index 29e7e11..634ed51 100644
--- a/pkg/analyzer/test/src/dart/micro/file_resolution.dart
+++ b/pkg/analyzer/test/src/dart/micro/file_resolution.dart
@@ -121,7 +121,7 @@
String path, {
OperationPerformanceImpl? performance,
}) async {
- result = await fileResolver.resolve2(
+ result = await fileResolver.resolve(
path: path,
performance: performance,
);
diff --git a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
index 0c11dff..296c503 100644
--- a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
+++ b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
@@ -2553,7 +2553,7 @@
}
Future<Element> _findElement(int offset, String filePath) async {
- var resolvedUnit = await fileResolver.resolve2(path: filePath);
+ var resolvedUnit = await fileResolver.resolve(path: filePath);
var node = NodeLocator(offset).searchWithin(resolvedUnit.unit);
var element = getElementOfNode(node);
return element!;
