| Index: pkg/analysis_server/lib/src/domain_analysis.dart
|
| diff --git a/pkg/analysis_server/lib/src/domain_analysis.dart b/pkg/analysis_server/lib/src/domain_analysis.dart
|
| index ee538e05888097e095f13aef2928a5685d2def5a..746559be0e01524960cec39174f6706e6d3077e2 100644
|
| --- a/pkg/analysis_server/lib/src/domain_analysis.dart
|
| +++ b/pkg/analysis_server/lib/src/domain_analysis.dart
|
| @@ -4,6 +4,8 @@
|
|
|
| library domain.analysis;
|
|
|
| +import 'dart:async';
|
| +
|
| import 'package:analysis_server/src/analysis_server.dart';
|
| import 'package:analysis_server/src/computer/computer_hover.dart';
|
| import 'package:analysis_server/src/constants.dart';
|
| @@ -32,25 +34,33 @@ class AnalysisDomainHandler implements RequestHandler {
|
| */
|
| Response getErrors(Request request) {
|
| String file = new AnalysisGetErrorsParams.fromRequest(request).file;
|
| - server.onFileAnalysisComplete(file).then((_) {
|
| - engine.AnalysisErrorInfo errorInfo = server.getErrors(file);
|
| - List<AnalysisError> errors;
|
| - if (errorInfo == null) {
|
| - errors = [];
|
| - } else {
|
| - errors = AnalysisError.listFromEngine(errorInfo.lineInfo,
|
| - errorInfo.errors);
|
| - }
|
| - server.sendResponse(new AnalysisGetErrorsResult(errors).toResponse(
|
| - request.id));
|
| - }).catchError((message) {
|
| - if (message is! String) {
|
| - engine.AnalysisEngine.instance.logger.logError(
|
| - 'Illegal error message during getErrors: $message');
|
| - message = '';
|
| + Future<AnalysisDoneReason> completionFuture =
|
| + server.onFileAnalysisComplete(file);
|
| + if (completionFuture == null) {
|
| + return new Response.getErrorsInvalidFile(request);
|
| + }
|
| + completionFuture.then((AnalysisDoneReason reason) {
|
| + switch (reason) {
|
| + case AnalysisDoneReason.COMPLETE:
|
| + engine.AnalysisErrorInfo errorInfo = server.getErrors(file);
|
| + List<AnalysisError> errors;
|
| + if (errorInfo == null) {
|
| + server.sendResponse(new Response.getErrorsInvalidFile(request));
|
| + } else {
|
| + errors = AnalysisError.listFromEngine(errorInfo.lineInfo,
|
| + errorInfo.errors);
|
| + server.sendResponse(new AnalysisGetErrorsResult(errors).toResponse(
|
| + request.id));
|
| + }
|
| + break;
|
| + case AnalysisDoneReason.CONTEXT_REMOVED:
|
| + // The active contexts have changed, so try again.
|
| + Response response = getErrors(request);
|
| + if (response != Response.DELAYED_RESPONSE) {
|
| + server.sendResponse(response);
|
| + }
|
| + break;
|
| }
|
| - server.sendResponse(new Response.getErrorsError(request, message,
|
| - new AnalysisGetErrorsResult([]).toJson()));
|
| });
|
| // delay response
|
| return Response.DELAYED_RESPONSE;
|
|
|