| Index: pkg/analysis_server/lib/src/domain_completion.dart
|
| diff --git a/pkg/analysis_server/lib/src/domain_completion.dart b/pkg/analysis_server/lib/src/domain_completion.dart
|
| index 916b20e7f4e4f2a72b50166864c236d1d00a4c1c..a9111452176e3fbf17e9e64ea7afb3ccb797aedb 100644
|
| --- a/pkg/analysis_server/lib/src/domain_completion.dart
|
| +++ b/pkg/analysis_server/lib/src/domain_completion.dart
|
| @@ -9,30 +9,31 @@ import 'dart:async';
|
| import 'package:analysis_server/plugin/protocol/protocol.dart';
|
| import 'package:analysis_server/src/analysis_server.dart';
|
| import 'package:analysis_server/src/constants.dart';
|
| +import 'package:analysis_server/src/domain_abstract.dart';
|
| +import 'package:analysis_server/src/plugin/plugin_manager.dart';
|
| +import 'package:analysis_server/src/plugin/result_converter.dart';
|
| import 'package:analysis_server/src/provisional/completion/completion_core.dart';
|
| import 'package:analysis_server/src/services/completion/completion_core.dart';
|
| import 'package:analysis_server/src/services/completion/completion_performance.dart';
|
| import 'package:analyzer/src/dart/analysis/driver.dart';
|
| import 'package:analyzer/src/generated/engine.dart' hide AnalysisResult;
|
| -import 'package:analyzer/src/source/source_resource.dart';
|
| import 'package:analyzer/src/generated/source.dart';
|
| +import 'package:analyzer/src/source/source_resource.dart';
|
| +import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
|
| +import 'package:analyzer_plugin/protocol/protocol_constants.dart' as plugin;
|
| +import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;
|
|
|
| /**
|
| * Instances of the class [CompletionDomainHandler] implement a [RequestHandler]
|
| * that handles requests in the completion domain.
|
| */
|
| -class CompletionDomainHandler implements RequestHandler {
|
| +class CompletionDomainHandler extends AbstractRequestHandler {
|
| /**
|
| * The maximum number of performance measurements to keep.
|
| */
|
| static const int performanceListMaxLength = 50;
|
|
|
| /**
|
| - * The analysis server that is using this handler to process requests.
|
| - */
|
| - final AnalysisServer server;
|
| -
|
| - /**
|
| * The next completion response id.
|
| */
|
| int _nextCompletionId = 0;
|
| @@ -62,7 +63,7 @@ class CompletionDomainHandler implements RequestHandler {
|
| /**
|
| * Initialize a new request handler for the given [server].
|
| */
|
| - CompletionDomainHandler(this.server);
|
| + CompletionDomainHandler(AnalysisServer server) : super(server);
|
|
|
| /**
|
| * Compute completion results for the given request and append them to the stream.
|
| @@ -71,8 +72,24 @@ class CompletionDomainHandler implements RequestHandler {
|
| * Subclasses should override this method, append at least one result
|
| * to the [controller], and close the controller stream once complete.
|
| */
|
| - Future<CompletionResult> computeSuggestions(
|
| - CompletionRequestImpl request) async {
|
| + Future<CompletionResult> computeSuggestions(CompletionRequestImpl request,
|
| + CompletionGetSuggestionsParams params) async {
|
| + //
|
| + // Allow plugins to start computing fixes.
|
| + //
|
| + Map<PluginInfo, Future<plugin.Response>> pluginFutures;
|
| + plugin.CompletionGetSuggestionsParams requestParams;
|
| + if (server.options.enableNewAnalysisDriver) {
|
| + String file = params.file;
|
| + int offset = params.offset;
|
| + AnalysisDriver driver = server.getAnalysisDriver(file);
|
| + requestParams = new plugin.CompletionGetSuggestionsParams(file, offset);
|
| + pluginFutures = server.pluginManager
|
| + .broadcastRequest(requestParams, contextRoot: driver.contextRoot);
|
| + }
|
| + //
|
| + // Compute completions generated by server.
|
| + //
|
| Iterable<CompletionContributor> newContributors =
|
| server.serverPlugin.completionContributors;
|
| List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
|
| @@ -94,10 +111,26 @@ class CompletionDomainHandler implements RequestHandler {
|
|
|
| performance.logElapseTime(COMPUTE_SUGGESTIONS_TAG);
|
|
|
| - // TODO (danrubel) if request is obsolete
|
| - // (processAnalysisRequest returns false)
|
| - // then send empty results
|
| -
|
| + // TODO (danrubel) if request is obsolete (processAnalysisRequest returns
|
| + // false) then send empty results
|
| +
|
| + //
|
| + // Add the fixes produced by plugins to the server-generated fixes.
|
| + //
|
| + if (pluginFutures != null) {
|
| + List<plugin.Response> responses = await waitForResponses(pluginFutures,
|
| + requestParameters: requestParams);
|
| + ResultConverter converter = new ResultConverter();
|
| + for (plugin.Response response in responses) {
|
| + plugin.CompletionGetSuggestionsResult result =
|
| + new plugin.CompletionGetSuggestionsResult.fromResponse(response);
|
| + suggestions
|
| + .addAll(result.results.map(converter.convertCompletionSuggestion));
|
| + }
|
| + }
|
| + //
|
| + // Return the result.
|
| + //
|
| return new CompletionResult(
|
| request.replacementOffset, request.replacementLength, suggestions);
|
| }
|
| @@ -197,7 +230,8 @@ class CompletionDomainHandler implements RequestHandler {
|
| .toResponse(request.id));
|
|
|
| // Compute suggestions in the background
|
| - computeSuggestions(completionRequest).then((CompletionResult result) {
|
| + computeSuggestions(completionRequest, params)
|
| + .then((CompletionResult result) {
|
| const SEND_NOTIFICATION_TAG = 'send notification';
|
| performance.logStartTime(SEND_NOTIFICATION_TAG);
|
| sendCompletionNotification(completionId, result.replacementOffset,
|
|
|