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

Use isCancellationRequested

Browse Source
This commit is contained in:
Matt Bierner
2019-01-10 15:51:12 -08:00
parent 66511a0bdb
commit d2a8ca946f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/typescript-language-features/src/tsServer/server.ts
View File

@@ -308,18 +308,16 @@ export class TypeScriptServer extends Disposable {
};
let result: Promise<any>;
if (executeInfo.expectsResult) {
let wasCancelled = false;
result = new Promise<any>((resolve, reject) => {
this._callbacks.add(request.seq, { onSuccess: resolve, onError: reject, startTime: Date.now(), isAsync: executeInfo.isAsync }, executeInfo.isAsync);
if (executeInfo.token) {
executeInfo.token.onCancellationRequested(() => {
wasCancelled = true;
this.tryCancelRequest(request.seq, command);
});
}
}).catch((err: any) => {
if (!wasCancelled) {
if (!executeInfo.token || !executeInfo.token.isCancellationRequested) {
this._logger.error(`'${command}' request failed with error.`, err);
const properties = this.parseErrorText(err && err.message, command);
/* __GDPR__