From 3bf2a074fb23f399d4a27041dab2d016825458b1 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 3 Jul 2018 13:45:47 +0200 Subject: [PATCH] Reduce usage of winjs promise progress --- src/vs/base/common/async.ts | 2 +- src/vs/base/common/worker/simpleWorker.ts | 8 ++++---- src/vs/base/node/processes.ts | 4 ++-- src/vs/base/test/common/utils.ts | 12 +++--------- src/vs/base/test/common/winjs.promise.test.ts | 4 ++-- src/vs/editor/common/model/textModel.ts | 2 +- src/vs/editor/standalone/browser/colorizer.ts | 4 ++-- .../platform/integrity/node/integrityServiceImpl.ts | 2 +- .../services/extensions/node/extensionPoints.ts | 4 ++-- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index aa4da71edc6..985c5185c3a 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -352,7 +352,7 @@ export class Barrier { constructor() { this._isOpen = false; - this._promise = new TPromise((c, e, p) => { + this._promise = new TPromise((c, e) => { this._completePromise = c; }, () => { console.warn('You should really not try to cancel this ready promise!'); diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts index ceaaa0ff541..8b0862a816d 100644 --- a/src/vs/base/common/worker/simpleWorker.ts +++ b/src/vs/base/common/worker/simpleWorker.ts @@ -91,7 +91,7 @@ class SimpleWorkerProtocol { c: null, e: null }; - let result = new TPromise((c, e, p) => { + let result = new TPromise((c, e) => { reply.c = c; reply.e = e; }, () => { @@ -232,7 +232,7 @@ export class SimpleWorkerClient extends Disposable { loaderConfiguration = (self).requirejs.s.contexts._.config; } - this._lazyProxy = new TPromise((c, e, p) => { + this._lazyProxy = new TPromise((c, e) => { lazyProxyFulfill = c; lazyProxyReject = e; }, () => { /* no cancel */ }); @@ -273,7 +273,7 @@ export class SimpleWorkerClient extends Disposable { } private _request(method: string, args: any[]): TPromise { - return new TPromise((c, e, p) => { + return new TPromise((c, e) => { this._onModuleLoaded.then(() => { this._protocol.sendMessage(method, args).then(c, e); }, e); @@ -363,7 +363,7 @@ export class SimpleWorkerServer { let cc: ValueCallback; let ee: ErrorCallback; - let r = new TPromise((c, e, p) => { + let r = new TPromise((c, e) => { cc = c; ee = e; }); diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts index ea32b4dce2f..eb01c197f74 100644 --- a/src/vs/base/node/processes.ts +++ b/src/vs/base/node/processes.ts @@ -234,7 +234,7 @@ export abstract class AbstractProcess { if (this.cmd) { childProcess = cp.spawn(this.cmd, this.args, this.options); } else if (this.module) { - this.childProcessPromise = new TPromise((c, e, p) => { + this.childProcessPromise = new TPromise((c, e) => { fork(this.module, this.args, this.options, (error: any, childProcess: cp.ChildProcess) => { if (error) { e(error); @@ -323,7 +323,7 @@ export abstract class AbstractProcess { } private useExec(): TPromise { - return new TPromise((c, e, p) => { + return new TPromise((c, e) => { if (!this.shell || !Platform.isWindows) { c(false); } diff --git a/src/vs/base/test/common/utils.ts b/src/vs/base/test/common/utils.ts index 1875a6f6450..f0e948976fa 100644 --- a/src/vs/base/test/common/utils.ts +++ b/src/vs/base/test/common/utils.ts @@ -8,7 +8,7 @@ import * as errors from 'vs/base/common/errors'; import * as paths from 'vs/base/common/paths'; import URI from 'vs/base/common/uri'; -import { PPromise, ProgressCallback, TProgressCallback, TPromise, TValueCallback } from 'vs/base/common/winjs.base'; +import { PPromise, TProgressCallback, TPromise, TValueCallback } from 'vs/base/common/winjs.base'; export class DeferredTPromise extends TPromise { @@ -16,17 +16,15 @@ export class DeferredTPromise extends TPromise { private completeCallback: TValueCallback; private errorCallback: (err: any) => void; - private progressCallback: ProgressCallback; constructor() { let captured: any; - super((c, e, p) => { - captured = { c, e, p }; + super((c, e) => { + captured = { c, e }; }, () => this.oncancel()); this.canceled = false; this.completeCallback = captured.c; this.errorCallback = captured.e; - this.progressCallback = captured.p; } public complete(value: T) { @@ -37,10 +35,6 @@ export class DeferredTPromise extends TPromise { this.errorCallback(err); } - public progress(p: any) { - this.progressCallback(p); - } - private oncancel(): void { this.canceled = true; } diff --git a/src/vs/base/test/common/winjs.promise.test.ts b/src/vs/base/test/common/winjs.promise.test.ts index a9b3038b457..c8f0070d124 100644 --- a/src/vs/base/test/common/winjs.promise.test.ts +++ b/src/vs/base/test/common/winjs.promise.test.ts @@ -11,7 +11,7 @@ suite('WinJS and ES6 Promises', function () { test('Promise.resolve', function () { let resolveTPromise; - const tPromise = new winjs.Promise(function (c, e, p) { + const tPromise = new winjs.Promise((c, e) => { resolveTPromise = c; }); @@ -28,7 +28,7 @@ suite('WinJS and ES6 Promises', function () { test('new Promise', function () { let resolveTPromise; - const tPromise = new winjs.Promise(function (c, e, p) { + const tPromise = new winjs.Promise((c, e) => { resolveTPromise = c; }); diff --git a/src/vs/editor/common/model/textModel.ts b/src/vs/editor/common/model/textModel.ts index 53dc47f82e1..1a4005d6a1b 100644 --- a/src/vs/editor/common/model/textModel.ts +++ b/src/vs/editor/common/model/textModel.ts @@ -46,7 +46,7 @@ export function createTextBufferFactory(text: string): model.ITextBufferFactory } export function createTextBufferFactoryFromStream(stream: IStringStream, filter?: (chunk: string) => string): TPromise { - return new TPromise((c, e, p) => { + return new TPromise((c, e) => { let done = false; let builder = createTextBufferBuilder(); diff --git a/src/vs/editor/standalone/browser/colorizer.ts b/src/vs/editor/standalone/browser/colorizer.ts index 298a4d7a0d5..1f5595800c8 100644 --- a/src/vs/editor/standalone/browser/colorizer.ts +++ b/src/vs/editor/standalone/browser/colorizer.ts @@ -42,7 +42,7 @@ export class Colorizer { let render = (str: string) => { domNode.innerHTML = str; }; - return this.colorize(modeService, text, mimeType, options).then(render, (err) => console.error(err), render); + return this.colorize(modeService, text, mimeType, options).then(render, (err) => console.error(err)); } private static _tokenizationSupportChangedPromise(language: string): TPromise { @@ -54,7 +54,7 @@ export class Colorizer { } }; - return new TPromise((c, e, p) => { + return new TPromise((c, e) => { listener = TokenizationRegistry.onDidChange((e) => { if (e.changedLanguages.indexOf(language) >= 0) { stopListening(); diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/platform/integrity/node/integrityServiceImpl.ts index 5a45065e013..0113966b1cc 100644 --- a/src/vs/platform/integrity/node/integrityServiceImpl.ts +++ b/src/vs/platform/integrity/node/integrityServiceImpl.ts @@ -133,7 +133,7 @@ export class IntegrityServiceImpl implements IIntegrityService { private _resolve(filename: string, expected: string): TPromise { let fileUri = URI.parse(require.toUrl(filename)); - return new TPromise((c, e, p) => { + return new TPromise((c, e) => { fs.readFile(fileUri.fsPath, (err, buff) => { if (err) { return e(err); diff --git a/src/vs/workbench/services/extensions/node/extensionPoints.ts b/src/vs/workbench/services/extensions/node/extensionPoints.ts index 1d00242b57a..90cfe42920d 100644 --- a/src/vs/workbench/services/extensions/node/extensionPoints.ts +++ b/src/vs/workbench/services/extensions/node/extensionPoints.ts @@ -208,7 +208,7 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler { * Parses original message bundle, returns null if the original message bundle is null. */ private static resolveOriginalMessageBundle(originalMessageBundle: string, errors: json.ParseError[]) { - return new TPromise<{ [key: string]: string; }>((c, e, p) => { + return new TPromise<{ [key: string]: string; }>((c, e) => { if (originalMessageBundle) { pfs.readFile(originalMessageBundle).then(originalBundleContent => { c(json.parse(originalBundleContent.toString(), errors)); @@ -226,7 +226,7 @@ class ExtensionManifestNLSReplacer extends ExtensionManifestHandler { * If the localized file is not present, returns null for the original and marks original as localized. */ private static findMessageBundles(nlsConfig: NlsConfiguration, basename: string): TPromise<{ localized: string, original: string }> { - return new TPromise<{ localized: string, original: string }>((c, e, p) => { + return new TPromise<{ localized: string, original: string }>((c, e) => { function loop(basename: string, locale: string): void { let toCheck = `${basename}.nls.${locale}.json`; pfs.fileExists(toCheck).then(exists => { -- GitLab