development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure to cancel inlay hint request when model is disposed

Browse source
This commit is contained in:
Johannes Rieken 2022-01-19 11:29:55 +01:00
parent 92fc47feb0
commit 5071afbbb8
No known key found for this signature in database
GPG key ID: 96634B5AF12F8798
2 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/editor/contrib/inlayHints/inlayHints.ts
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { CancellationToken } from 'vs/base/common/cancellation';
import { onUnexpectedExternalError } from 'vs/base/common/errors';
import { CancellationError, onUnexpectedExternalError } from 'vs/base/common/errors';
import { DisposableStore } from 'vs/base/common/lifecycle';
import { IPosition, Position } from 'vs/editor/common/core/position';
import { Range } from 'vs/editor/common/core/range';
@ -81,6 +81,10 @@ export class InlayHintsFragments {
await Promise.all(promises.flat());
if (token.isCancellationRequested || model.isDisposed()) {
throw new CancellationError();
}
return new InlayHintsFragments(ranges, data, model);
}

45
src/vs/editor/contrib/inlayHints/inlayHintsController.ts
View file

@ -5,6 +5,7 @@
import { RunOnceScheduler } from 'vs/base/common/async';
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
import { onUnexpectedError } from 'vs/base/common/errors';
import { DisposableStore, IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { LRUCache } from 'vs/base/common/map';
import { IRange } from 'vs/base/common/range';
@ -133,26 +134,36 @@ export class InlayHintsController implements IEditorContribution {
cts?.dispose(true);
cts = new CancellationTokenSource();
const listener = model.onWillDispose(() => cts?.cancel());
const myToken = cts.token;
const inlayHints = await InlayHintsFragments.create(model, this._getHintsRanges(), myToken);
scheduler.delay = this._debounceInfo.update(model, Date.now() - t1);
if (myToken.isCancellationRequested) {
inlayHints.dispose();
return;
}
// listen to provider changes
for (const provider of inlayHints.provider) {
if (typeof provider.onDidChangeInlayHints === 'function' && !watchedProviders.has(provider)) {
this._sessionDisposables.add(provider.onDidChangeInlayHints(() => scheduler.schedule()));
watchedProviders.add(provider);
try {
const myToken = cts.token;
const inlayHints = await InlayHintsFragments.create(model, this._getHintsRanges(), myToken);
scheduler.delay = this._debounceInfo.update(model, Date.now() - t1);
if (myToken.isCancellationRequested) {
inlayHints.dispose();
return;
}
}
this._sessionDisposables.add(inlayHints);
this._updateHintsDecorators(inlayHints.ranges, inlayHints.items);
this._cacheHintsForFastRestore(model);
// listen to provider changes
for (const provider of inlayHints.provider) {
if (typeof provider.onDidChangeInlayHints === 'function' && !watchedProviders.has(provider)) {
this._sessionDisposables.add(provider.onDidChangeInlayHints(() => scheduler.schedule()));
watchedProviders.add(provider);
}
}
this._sessionDisposables.add(inlayHints);
this._updateHintsDecorators(inlayHints.ranges, inlayHints.items);
this._cacheHintsForFastRestore(model);
} catch (err) {
onUnexpectedError(err);
} finally {
cts.dispose();
listener.dispose();
}
}, this._debounceInfo.get(model));