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

Remove WinJS.Promise#cancel usage (#56137)

Browse Source
This commit is contained in:
Christof Marti
2018-09-05 09:13:06 +02:00
parent 8539f48172
commit 5f88f89be5
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/api/node/extHostQuickOpen.ts
View File

@@ -15,6 +15,7 @@ import { InputBox, InputBoxOptions, QuickInput, QuickInputButton, QuickPick, Qui
import { ExtHostQuickOpenShape, IMainContext, MainContext, MainThreadQuickOpenShape, TransferQuickPickItems, TransferQuickInput, TransferQuickInputButton } from './extHost.protocol';
import { URI } from 'vs/base/common/uri';
import { ThemeIcon, QuickInputButtons } from 'vs/workbench/api/node/extHostTypes';
import { isPromiseCanceledError } from 'vs/base/common/errors';
export type Item = string | QuickPickItem;
@@ -51,9 +52,9 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
matchOnDetail: options && options.matchOnDetail,
ignoreFocusLost: options && options.ignoreFocusOut,
canPickMany: options && options.canPickMany
});
}, token);
const promise = TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
return TPromise.any(<TPromise<number | Item[]>[]>[quickPickWidget, itemsPromise]).then(values => {
if (values.key === '0') {
return undefined;
}
@@ -104,13 +105,16 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape {
}
return undefined;
});
}, (err) => {
this._proxy.$setError(err);
return TPromise.wrapError(err);
});
}).then(null, err => {
if (isPromiseCanceledError(err)) {
return undefined;
}
this._proxy.$setError(err);
return TPromise.wrapError(err);
});
return wireCancellationToken<Item | Item[]>(token, promise, true);
}
$onItemSelected(handle: number): void {