Skip to content

Commit 9eddeae

Browse files
scheglovcommit-bot@chromium.org
authored andcommitted
Make DartCompletionRequestImpl.from() synchronous.
We give it (indirectly) ResolvedUnitResult, so it does not do any async operation. Change-Id: I2d29925fd20ea14bd984e6c3c226de466a03fb39 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/217824 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 985824d commit 9eddeae

File tree

10 files changed

+12
-17
lines changed

10 files changed

+12
-17
lines changed

pkg/analysis_server/lib/src/cider/completion.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class CiderCompletionComputer {
7878
CompletionPerformance(),
7979
);
8080

81-
_dartCompletionRequest = await DartCompletionRequestImpl.from(
81+
_dartCompletionRequest = DartCompletionRequestImpl.from(
8282
completionRequest,
8383
);
8484

pkg/analysis_server/lib/src/domain_completion.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class CompletionDomainHandler extends AbstractRequestHandler {
102102

103103
var contributorTag = 'computeSuggestions - ${manager.runtimeType}';
104104
await perf.runAsync(contributorTag, (performance) async {
105-
var dartRequest = await DartCompletionRequestImpl.from(
105+
var dartRequest = DartCompletionRequestImpl.from(
106106
request,
107107
dartdocDirectiveInfo: server.getDartdocDirectiveInfoFor(
108108
request.result,

pkg/analysis_server/lib/src/domains/execution/completion.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class RuntimeCompletionComputer {
7676
CompletionPerformance(),
7777
);
7878

79-
var dartRequest = await DartCompletionRequestImpl.from(request);
79+
var dartRequest = DartCompletionRequestImpl.from(request);
8080

8181
var suggestions = await request.performance.runRequestOperation(
8282
(performance) async {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ class CompletionHandler
213213
CompletionRequestImpl(unit, offset, performance);
214214
final directiveInfo =
215215
server.getDartdocDirectiveInfoFor(completionRequest.result);
216-
final dartCompletionRequest = await DartCompletionRequestImpl.from(
216+
final dartCompletionRequest = DartCompletionRequestImpl.from(
217217
completionRequest,
218218
dartdocDirectiveInfo: directiveInfo,
219219
completionPreference: CompletionPreference.replace,

pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,12 @@ class DartCompletionRequestImpl implements DartCompletionRequest {
364364
/// Return a newly created completion request based on the given [request].
365365
/// This method will throw [AbortCompletion] if the completion request has
366366
/// been aborted.
367-
static Future<DartCompletionRequestImpl> from(
367+
static DartCompletionRequestImpl from(
368368
CompletionRequest request, {
369369
DartdocDirectiveInfo? dartdocDirectiveInfo,
370370
CompletionPreference completionPreference = CompletionPreference.insert,
371371
DocumentationCache? documentationCache,
372-
}) async {
372+
}) {
373373
request.checkAborted();
374374

375375
var result = request.result;

pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ abstract class _BaseDartCompletionContributorTest extends AbstractContextTest {
537537
return await baseRequest.performance.runRequestOperation(
538538
(performance) async {
539539
// Build the request
540-
var request = await DartCompletionRequestImpl.from(
540+
var request = DartCompletionRequestImpl.from(
541541
baseRequest,
542542
dartdocDirectiveInfo: dartdocInfo,
543543
);

pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,7 @@ part 'test.dart';
5757
completionOffset,
5858
CompletionPerformance());
5959
await baseRequest.performance.runRequestOperation((performance) async {
60-
var requestCompleter = Completer<DartCompletionRequest>();
61-
DartCompletionRequestImpl.from(baseRequest)
62-
.then((DartCompletionRequest request) {
63-
requestCompleter.complete(request);
64-
});
65-
request = await performAnalysis(200, requestCompleter);
60+
request = DartCompletionRequestImpl.from(baseRequest);
6661
});
6762

6863
var directives = request.target.unit.directives;

pkg/analysis_server/test/src/services/completion/dart/suggestion_builder_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ContextTypeTest extends AbstractSingleUnitTest {
2929
}
3030

3131
Future<CompletionSuggestion> forTopLevelFunction(String functionName) async {
32-
var request = await DartCompletionRequestImpl.from(
32+
var request = DartCompletionRequestImpl.from(
3333
CompletionRequestImpl(testAnalysisResult, 0, CompletionPerformance()),
3434
);
3535
var builder = SuggestionBuilder(request);

pkg/analysis_server/test/stress/completion/completion_runner.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class CompletionRunner {
100100

101101
timer.start();
102102
var request = CompletionRequestImpl(result, offset, statistics);
103-
var dartRequest = await DartCompletionRequestImpl.from(request);
103+
var dartRequest = DartCompletionRequestImpl.from(request);
104104
var suggestions = await request.performance.runRequestOperation(
105105
(performance) async {
106106
return await contributor.computeSuggestions(

pkg/analysis_server/tool/code_completion/completion_metrics.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ class CompletionMetricsComputer {
12081208
availableSuggestionsParams]) async {
12091209
List<protocol.CompletionSuggestion> suggestions;
12101210

1211-
var dartRequest = await DartCompletionRequestImpl.from(
1211+
var dartRequest = DartCompletionRequestImpl.from(
12121212
request,
12131213
dartdocDirectiveInfo: dartdocDirectiveInfo,
12141214
documentationCache: documentationCache,
@@ -1385,7 +1385,7 @@ class CompletionMetricsComputer {
13851385
late List<protocol.CompletionSuggestion> suggestions;
13861386
await request.performance.runRequestOperation(
13871387
(performance) async {
1388-
var dartRequest = await DartCompletionRequestImpl.from(
1388+
var dartRequest = DartCompletionRequestImpl.from(
13891389
request,
13901390
documentationCache: documentationCache,
13911391
);

0 commit comments

Comments
 (0)