languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-05 18:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Retry 'getSuggestionDetails' on InconsistentAnalysisException.

Browse source 
I was not able to create a test that triggers it, but I saw this
exception sometimes while using it myself.

R=brianwilkerson@google.com

Change-Id: Ia8773a9914b03e73622d5e59f570006723426d42
Reviewed-on: https://dart-review.googlesource.com/c/93281
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Konstantin Shcheglov 2019-02-14 23:02:11 +00:00 committed by commit-bot@chromium.org
parent 54dbc0068a
commit c8abe45b00
1 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
pkg/analysis_server/lib/src/domain_completion.dart
View file

@ -17,6 +17,7 @@ import 'package:analysis_server/src/services/completion/completion_core.dart';
import 'package:analysis_server/src/services/completion/completion_performance.dart';
import 'package:analysis_server/src/services/completion/dart/completion_manager.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer_plugin/protocol/protocol.dart' as plugin;
import 'package:analyzer_plugin/protocol/protocol_common.dart';
@ -61,6 +62,12 @@ class CompletionDomainHandler extends AbstractRequestHandler {
*/
CompletionRequestImpl _currentRequest;
/**
* The identifiers of the latest `getSuggestionDetails` request.
* We use it to abort previous requests.
*/
int _latestGetSuggestionDetailsId = 0;
/**
* Initialize a new request handler for the given [server].
*/
@ -173,11 +180,6 @@ class CompletionDomainHandler extends AbstractRequestHandler {
return;
}
var analysisDriver = server.getAnalysisDriver(file);
var session = analysisDriver.currentSession;
var resolvedLibrary = await session.getResolvedLibrary(file);
var requestedLibraryElement = await session.getLibraryByUri(library.uriStr);
// The label might be `MyEnum.myValue`, but we import only `MyEnum`.
var requestedName = params.label;
if (requestedName.contains('.')) {
@ -187,26 +189,48 @@ class CompletionDomainHandler extends AbstractRequestHandler {
);
}
var completion = params.label;
var builder = DartChangeBuilder(session);
await builder.addFileEdit(file, (builder) {
var result = builder.importLibraryElement(
targetLibrary: resolvedLibrary,
targetPath: file,
targetOffset: params.offset,
requestedLibrary: requestedLibraryElement,
requestedName: requestedName,
);
if (result.prefix != null) {
completion = '${result.prefix}.$completion';
}
});
const timeout = Duration(milliseconds: 1000);
var timer = Stopwatch()..start();
var id = ++_latestGetSuggestionDetailsId;
while (id == _latestGetSuggestionDetailsId && timer.elapsed < timeout) {
try {
var analysisDriver = server.getAnalysisDriver(file);
var session = analysisDriver.currentSession;
var resolvedLibrary = await session.getResolvedLibrary(file);
var requestedLibraryElement = await session.getLibraryByUri(
library.uriStr,
);
var completion = params.label;
var builder = DartChangeBuilder(session);
await builder.addFileEdit(file, (builder) {
var result = builder.importLibraryElement(
targetLibrary: resolvedLibrary,
targetPath: file,
targetOffset: params.offset,
requestedLibrary: requestedLibraryElement,
requestedName: requestedName,
);
if (result.prefix != null) {
completion = '${result.prefix}.$completion';
}
});
server.sendResponse(
CompletionGetSuggestionDetailsResult(
completion,
change: builder.sourceChange,
).toResponse(request.id),
);
return;
} on InconsistentAnalysisException {
// Loop around to try again.
}
}
// Timeout or abort, send the empty response.
server.sendResponse(
CompletionGetSuggestionDetailsResult(
completion,
change: builder.sourceChange,
).toResponse(request.id),
CompletionGetSuggestionDetailsResult('').toResponse(request.id),
);
}