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

Merge pull request #183452 from microsoft/ulugbekna/computeStickyModel-model-is-disposed

Browse source 
computeStickyModel: check token cancellation because it signals that the model is disposed
This commit is contained in:
Aiday Marlen Kyzy 2023-05-26 09:21:11 +02:00 committed by GitHub
parent 8242d20803 2999ca59c5
commit 670f92f22b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.ts
View file

@ -157,7 +157,7 @@ abstract class StickyModelCandidateProvider<T> implements IStickyModelCandidateP
public abstract get provider(): LanguageFeatureRegistry<object> | null;
public computeStickyModel(textModel: ITextModel, modelVersionId: number, token: CancellationToken): { statusPromise: Promise<Status> | Status; modelPromise: CancelablePromise<T | null> | null } {
if (!this.isProviderValid(textModel)) {
if (token.isCancellationRequested || !this.isProviderValid(textModel)) {
return { statusPromise: this._invalid(), modelPromise: null };
}
const providerModelPromise = createCancelablePromise(token => this.createModelFromProvider(textModel, modelVersionId, token));