Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

code lens must handle cancellation correctly, fixes #2084

Browse Source
This commit is contained in:
Johannes Rieken
2016-01-18 12:55:47 +01:00
parent f7f6663eca
commit d6c6437154
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -15,7 +15,6 @@ import * as TypeConverters from 'vs/workbench/api/node/extHostTypeConverters';
import {Range, DocumentHighlightKind, Disposable, Diagnostic, SignatureHelp} from 'vs/workbench/api/node/extHostTypes';
import {IPosition, IRange, ISingleEditOperation} from 'vs/editor/common/editorCommon';
import * as modes from 'vs/editor/common/modes';
import {CancellationTokenSource} from 'vs/base/common/cancellation';
import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments';
import {IMarkerService, IMarker} from 'vs/platform/markers/common/markers';
import {ExtHostCommands} from 'vs/workbench/api/node/extHostCommands';
@@ -31,7 +30,7 @@ import {FormatRegistry, FormatOnTypeRegistry} from 'vs/editor/contrib/format/com
import {CodeLensRegistry} from 'vs/editor/contrib/codelens/common/codelens';
import {ParameterHintsRegistry} from 'vs/editor/contrib/parameterHints/common/parameterHints';
import {SuggestRegistry} from 'vs/editor/contrib/suggest/common/suggest';
import {asWinJsPromise} from 'vs/base/common/async';
import {asWinJsPromise, ShallowCancelThenPromise} from 'vs/base/common/async';
// --- adapter
@@ -83,7 +82,7 @@ class CodeLensAdapter implements modes.ICodeLensSupport {
// from cache
let entry = this._cache[key];
if (entry && entry.version === version) {
return entry.data.then(cached => cached.symbols);
return new ShallowCancelThenPromise(entry.data.then(cached => cached.symbols));
}
const newCodeLensData = asWinJsPromise(token => this._provider.provideCodeLenses(doc, token)).then(lenses => {
@@ -113,13 +112,13 @@ class CodeLensAdapter implements modes.ICodeLensSupport {
data: newCodeLensData
};
return newCodeLensData.then(newCached => {
return new ShallowCancelThenPromise(newCodeLensData.then(newCached => {
if (entry) {
// only now dispose old commands et al
entry.data.then(oldCached => disposeAll(oldCached.disposables));
}
return newCached && newCached.symbols;
});
}));
}