From f7eeebcd4eeb448cfa333ee6fd301491e8ccc9b7 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 4 Sep 2018 12:44:58 +0200 Subject: [PATCH] done with done, #57695 --- src/vs/base/common/async.ts | 10 +++++----- src/vs/base/common/winjs.base.d.ts | 4 ---- src/vs/base/parts/ipc/node/ipc.cp.ts | 2 +- src/vs/base/parts/ipc/node/ipc.ts | 2 +- src/vs/monaco.d.ts | 4 ---- .../node/extensionsManifestCache.ts | 2 +- .../electron-browser/extensionTipsService.ts | 2 +- .../workbench/services/extensions/node/lazyPromise.ts | 8 -------- 8 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index 3c0a23f76c0..b2cdcca32e8 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -160,7 +160,7 @@ export class Throttler { }; this.queuedPromise = new TPromise(c => { - this.activePromise.then(onComplete, onComplete).done(c); + this.activePromise.then(onComplete, onComplete).then(c); }, () => { this.activePromise.cancel(); }); @@ -176,7 +176,7 @@ export class Throttler { this.activePromise = promiseFactory(); return new TPromise((c, e) => { - this.activePromise.done((result: any) => { + this.activePromise.then((result: any) => { this.activePromise = null; c(result); }, (err: any) => { @@ -378,7 +378,7 @@ export function timeout(n: number): CancelablePromise { * @returns `true` if candidate is a `WinJS.Promise` */ export function isWinJSPromise(candidate: any): candidate is TPromise { - return isThenable(candidate) && typeof (candidate).done === 'function'; + return isThenable(candidate) && typeof (candidate as any).done === 'function'; } /** @@ -524,8 +524,8 @@ export class Limiter { this.runningPromises++; const promise = iLimitedTask.factory(); - promise.done(iLimitedTask.c, iLimitedTask.e); - promise.done(() => this.consumed(), () => this.consumed()); + promise.then(iLimitedTask.c, iLimitedTask.e); + promise.then(() => this.consumed(), () => this.consumed()); } } diff --git a/src/vs/base/common/winjs.base.d.ts b/src/vs/base/common/winjs.base.d.ts index 7cf7a842c11..b61deae50d1 100644 --- a/src/vs/base/common/winjs.base.d.ts +++ b/src/vs/base/common/winjs.base.d.ts @@ -17,10 +17,6 @@ export class Promise { onfulfilled?: ((value: T) => TResult1 | PromiseLike) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike) | null): Promise; - public done( - onfulfilled?: (value: T) => void, - onrejected?: (reason: any) => void): void; - public cancel(): void; public static as(value: null): Promise; diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts index 9c709880779..62811e105df 100644 --- a/src/vs/base/parts/ipc/node/ipc.cp.ts +++ b/src/vs/base/parts/ipc/node/ipc.cp.ts @@ -113,7 +113,7 @@ export class Client implements IChannelClient, IDisposable { const request: TPromise = channel.call(name, arg); const result = new TPromise((c, e) => { - request.then(c, e).done(() => { + request.then(c, e).then(() => { if (!this.activeRequests) { return; } diff --git a/src/vs/base/parts/ipc/node/ipc.ts b/src/vs/base/parts/ipc/node/ipc.ts index 0c17d1414c5..219d6defc54 100644 --- a/src/vs/base/parts/ipc/node/ipc.ts +++ b/src/vs/base/parts/ipc/node/ipc.ts @@ -334,7 +334,7 @@ export class ChannelClient implements IChannelClient, IDisposable { activeRequest .then(null, _ => null) - .done(() => this.activeRequests = this.activeRequests.filter(el => el !== disposable)); + .then(() => this.activeRequests = this.activeRequests.filter(el => el !== disposable)); return activeRequest; } diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts index 2746feec55d..d06556dfb77 100644 --- a/src/vs/monaco.d.ts +++ b/src/vs/monaco.d.ts @@ -53,10 +53,6 @@ declare namespace monaco { onfulfilled?: ((value: T) => TResult1 | PromiseLike) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike) | null): Promise; - public done( - onfulfilled?: (value: T) => void, - onrejected?: (reason: any) => void): void; - public cancel(): void; public static as(value: null): Promise; diff --git a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts index a4e1887321f..fccfd884505 100644 --- a/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts +++ b/src/vs/platform/extensionManagement/node/extensionsManifestCache.ts @@ -37,6 +37,6 @@ export class ExtensionsManifestCache extends Disposable { } invalidate(): void { - pfs.del(this.extensionsManifestCache).done(() => { }, () => { }); + pfs.del(this.extensionsManifestCache).then(() => { }, () => { }); } } diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts index 55f5acbbf05..67c2a6493f4 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionTipsService.ts @@ -714,7 +714,7 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe return; } - return this.extensionsService.getInstalled(LocalExtensionType.User).done(local => { + this.extensionsService.getInstalled(LocalExtensionType.User).then(local => { const recommendations = filteredRecs.filter(({ extensionId }) => local.every(local => !areSameExtensions({ id: extensionId }, { id: getGalleryExtensionIdFromLocal(local) }))); if (!recommendations.length) { diff --git a/src/vs/workbench/services/extensions/node/lazyPromise.ts b/src/vs/workbench/services/extensions/node/lazyPromise.ts index 2b096574133..1d045268b71 100644 --- a/src/vs/workbench/services/extensions/node/lazyPromise.ts +++ b/src/vs/workbench/services/extensions/node/lazyPromise.ts @@ -91,14 +91,6 @@ export class LazyPromise implements TPromise { return this._ensureActual().then(success, error); } - public done(success: any, error: any): void { - if (this._isCanceled) { - return; - } - - this._ensureActual().done(success, error); - } - public cancel(): void { if (this._hasValue || this._hasErr) { return; -- GitLab