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

Don't reject status indicator promise

Browse Source 
Fixes #138453

Looks like `withProgress` does not handle rejections. To dismiss the indicator, we can simply resolve the promise instead
This commit is contained in:
Matt Bierner
2021-12-07 12:08:39 -08:00
parent 4024a1e84d
commit 26b621a773
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/typescript-language-features/src/typescriptServiceClient.ts
View File

@@ -1059,13 +1059,12 @@ function getDignosticsKind(event: Proto.Event) {
}
class ServerInitializingIndicator extends Disposable {
private _task?: { project: string | undefined, resolve: () => void, reject: (error: Error) => void };
private _task?: { project: string | undefined, resolve: () => void };
public reset(): void {
if (this._task) {
const error = new Error('Canceled');
error.name = error.message;
this._task.reject(error);
this._task.resolve();
this._task = undefined;
}
}
@@ -1081,8 +1080,8 @@ class ServerInitializingIndicator extends Disposable {
vscode.window.withProgress({
location: vscode.ProgressLocation.Window,
title: localize('serverLoading.progress', "Initializing JS/TS language features"),
}, () => new Promise<void>((resolve, reject) => {
this._task = { project: projectName, resolve, reject };
}, () => new Promise<void>(resolve => {
this._task = { project: projectName, resolve };
}));
}