Simplify DartCompletionContributorTest.computeSuggestions() async behaviour.
R=brianwilkerson@google.com
Change-Id: I8a797e49406dd0b8eeb34c21d5ed824765c90abb
Reviewed-on: https://dart-review.googlesource.com/57901
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
index d6d8191..024e565 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_contributor_util.dart
@@ -475,31 +475,14 @@
analysisResult, completionOffset, new CompletionPerformance());
// Build the request
- Completer<DartCompletionRequest> requestCompleter =
- new Completer<DartCompletionRequest>();
- DartCompletionRequestImpl
- .from(baseRequest)
- .then((DartCompletionRequest request) {
- requestCompleter.complete(request);
- });
- request = await performAnalysis(times, requestCompleter);
+ var request = await DartCompletionRequestImpl.from(baseRequest);
var range = request.target.computeReplacementRange(request.offset);
replacementOffset = range.offset;
replacementLength = range.length;
- Completer<List<CompletionSuggestion>> suggestionCompleter =
- new Completer<List<CompletionSuggestion>>();
// Request completions
- contributor
- .computeSuggestions(request)
- .then((List<CompletionSuggestion> computedSuggestions) {
- suggestionCompleter.complete(computedSuggestions);
- });
-
- // Perform analysis until the suggestions have been computed
- // or the max analysis cycles ([times]) has been reached
- suggestions = await performAnalysis(times, suggestionCompleter);
+ suggestions = await contributor.computeSuggestions(request);
expect(suggestions, isNotNull, reason: 'expected suggestions');
}
