Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2835)

Unified Diff: pkg/analysis_server/lib/src/services/completion/completion_manager.dart

Issue 1538883003: remove internal streaming of results, remove obsolete test, cleanup unused code (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: merge Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/lib/src/services/completion/completion_manager.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/completion_manager.dart b/pkg/analysis_server/lib/src/services/completion/completion_manager.dart
index 5cb8baba48b30ace4314e8c6b4c0acea97fe150a..d2366bf8984874dfe0f5f3750b2f3145dae1e1f9 100644
--- a/pkg/analysis_server/lib/src/services/completion/completion_manager.dart
+++ b/pkg/analysis_server/lib/src/services/completion/completion_manager.dart
@@ -8,7 +8,11 @@ import 'dart:async';
import 'package:analysis_server/plugin/protocol/protocol.dart';
import 'package:analysis_server/src/provisional/completion/completion_core.dart'
- show CompletionContributor, CompletionContributorFactory, CompletionRequest, CompletionResult;
+ show
+ CompletionContributor,
+ CompletionContributorFactory,
+ CompletionRequest,
+ CompletionResult;
import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/src/generated/engine.dart';
@@ -28,11 +32,6 @@ abstract class CompletionManager {
*/
final Source source;
- /**
- * The controller used for returning completion results.
- */
- StreamController<CompletionResult> controller;
-
CompletionManager(this.context, this.source);
/**
@@ -71,25 +70,13 @@ abstract class CompletionManager {
* Subclasses should override this method, append at least one result
* to the [controller], and close the controller stream once complete.
*/
- void computeSuggestions(CompletionRequest request);
+ Future<CompletionResult> computeSuggestions(CompletionRequest request);
/**
* Discard any pending operations.
* Subclasses may override but should call super.dispose
*/
void dispose() {}
-
- /**
- * Generate a stream of code completion results.
- */
- Stream<CompletionResult> results(CompletionRequest request) {
- controller = new StreamController<CompletionResult>(onListen: () {
- scheduleMicrotask(() {
- computeSuggestions(request);
- });
- });
- return controller.stream;
- }
}
/**
@@ -220,27 +207,16 @@ class CompletionResultImpl implements CompletionResult {
*/
final List<CompletionSuggestion> suggestions;
- /**
- * `true` if this is that last set of results that will be returned
- * for the indicated completion.
- */
- final bool last;
-
- CompletionResultImpl(this.replacementOffset, this.replacementLength,
- this.suggestions, this.last);
-
- /**
- * Return `true` if this is the last completion result that will be produced.
- */
- bool get isLast => last;
+ CompletionResultImpl(
+ this.replacementOffset, this.replacementLength, this.suggestions);
}
class NoOpCompletionManager extends CompletionManager {
NoOpCompletionManager(Source source) : super(null, source);
@override
- void computeSuggestions(CompletionRequest request) {
- controller.add(new CompletionResultImpl(request.offset, 0, [], true));
+ Future<CompletionResult> computeSuggestions(CompletionRequest request) async {
+ return new CompletionResultImpl(request.offset, 0, []);
}
}

Powered by Google App Engine
This is Rietveld 408576698