diff --git a/src/vs/base/common/async.ts b/src/vs/base/common/async.ts index 410aad779bd..d593502de9d 100644 --- a/src/vs/base/common/async.ts +++ b/src/vs/base/common/async.ts @@ -164,13 +164,13 @@ export class Throttler { this.activePromise = promiseFactory(); - return new Promise((c, e) => { + return new Promise((resolve, reject) => { this.activePromise!.then((result: any) => { this.activePromise = null; - c(result); + resolve(result); }, (err: any) => { this.activePromise = null; - e(err); + reject(err); }); }); } diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts index 302fa75997e..bc11cdd6f12 100644 --- a/src/vs/base/node/processes.ts +++ b/src/vs/base/node/processes.ts @@ -318,16 +318,16 @@ export abstract class AbstractProcess { } private useExec(): Promise { - return new Promise((c, e) => { + return new Promise(resolve => { if (!this.shell || !Platform.isWindows) { - return c(false); + return resolve(false); } const cmdShell = cp.spawn(getWindowsShell(), ['/s', '/c']); cmdShell.on('error', (error: Error) => { - return c(true); + return resolve(true); }); cmdShell.on('exit', (data: any) => { - return c(false); + return resolve(false); }); }); } diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index 80aba3e754c..6d1db80fcf5 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -138,7 +138,7 @@ export async function main(argv: string[]): Promise { child.stdout!.on('data', (data: Buffer) => console.log(data.toString('utf8').trim())); child.stderr!.on('data', (data: Buffer) => console.log(data.toString('utf8').trim())); - await new Promise(c => child.once('exit', () => c())); + await new Promise(resolve => child.once('exit', () => resolve())); }); } @@ -332,13 +332,13 @@ export async function main(argv: string[]): Promise { const child = spawn(process.execPath, argv.slice(2), options); if (args.wait && waitMarkerFilePath) { - return new Promise(c => { + return new Promise(resolve => { // Complete when process exits - child.once('exit', () => c(undefined)); + child.once('exit', () => resolve(undefined)); // Complete when wait marker file is deleted - whenDeleted(waitMarkerFilePath!).then(c, c); + whenDeleted(waitMarkerFilePath!).then(resolve, resolve); }).then(() => { // Make sure to delete the tmp stdin file if we have any diff --git a/src/vs/platform/environment/node/stdin.ts b/src/vs/platform/environment/node/stdin.ts index a6b660643c6..c43dbd2e4cc 100644 --- a/src/vs/platform/environment/node/stdin.ts +++ b/src/vs/platform/environment/node/stdin.ts @@ -20,14 +20,14 @@ export function hasStdinWithoutTty() { } export function stdinDataListener(durationinMs: number): Promise { - return new Promise(c => { - const dataListener = () => c(true); + return new Promise(resolve => { + const dataListener = () => resolve(true); // wait for 1s maximum... setTimeout(() => { process.stdin.removeListener('data', dataListener); - c(false); + resolve(false); }, durationinMs); // ...but finish early if we detect data diff --git a/src/vs/platform/files/common/files.ts b/src/vs/platform/files/common/files.ts index b807bce9b5c..7f2b4f3a9c0 100644 --- a/src/vs/platform/files/common/files.ts +++ b/src/vs/platform/files/common/files.ts @@ -577,9 +577,7 @@ export class FileChangesEvent { } private hasType(type: FileChangeType): boolean { - return this.changes.some(change => { - return change.type === type; - }); + return this.changes.some(change => change.type === type); } filter(filterFn: (change: IFileChange) => boolean): FileChangesEvent { @@ -862,11 +860,11 @@ export function whenProviderRegistered(file: URI, fileService: IFileService): Pr return Promise.resolve(); } - return new Promise((c, e) => { + return new Promise(resolve => { const disposable = fileService.onDidChangeFileSystemProviderRegistrations(e => { if (e.scheme === file.scheme && e.added) { disposable.dispose(); - c(); + resolve(); } }); }); diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts index f1008af8846..48ad05b7b4c 100644 --- a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts +++ b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts @@ -379,7 +379,7 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe // Always allow to unload a window that is not yet ready if (!window.isReady) { - return Promise.resolve(false); + return false; } this.logService.trace(`Lifecycle#unload() - window ID ${window.id}`); @@ -432,17 +432,17 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe } private onBeforeUnloadWindowInRenderer(window: ICodeWindow, reason: UnloadReason): Promise { - return new Promise(c => { + return new Promise(resolve => { const oneTimeEventToken = this.oneTimeListenerTokenGenerator++; const okChannel = `vscode:ok${oneTimeEventToken}`; const cancelChannel = `vscode:cancel${oneTimeEventToken}`; ipc.once(okChannel, () => { - c(false); // no veto + resolve(false); // no veto }); ipc.once(cancelChannel, () => { - c(true); // veto + resolve(true); // veto }); window.send('vscode:onBeforeUnload', { okChannel, cancelChannel, reason }); diff --git a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts index d97c0447e45..e6a73e21e65 100644 --- a/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts +++ b/src/vs/workbench/contrib/files/test/browser/textFileEditorTracker.test.ts @@ -185,11 +185,11 @@ suite('Files - TextFileEditorTracker', () => { }); function awaitModelLoadEvent(textFileService: ITextFileService, resource: URI): Promise { - return new Promise(c => { + return new Promise(resolve => { const listener = textFileService.files.onDidLoad(e => { if (isEqual(e.model.resource, resource)) { listener.dispose(); - c(); + resolve(); } }); }); diff --git a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts index 2f178891264..f4a54339f7c 100644 --- a/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/editorGroupsService.test.ts @@ -1071,8 +1071,8 @@ suite('EditorGroupsService', () => { await group.openEditors([{ editor: input, options: { pinned: true } }, { editor: inputInactive }]); assert.equal(firstOpenEditorContext, undefined); - const waitForEditorWillOpen = new Promise(c => { - Event.once(rightGroup.onWillOpenEditor)(e => c(e.context)); + const waitForEditorWillOpen = new Promise(resolve => { + Event.once(rightGroup.onWillOpenEditor)(e => resolve(e.context)); }); group.moveEditor(inputInactive, rightGroup, { index: 0 }); @@ -1090,8 +1090,8 @@ suite('EditorGroupsService', () => { const input = new TestFileEditorInput(URI.file('foo/bar'), TEST_EDITOR_INPUT_ID); const inputInactive = new TestFileEditorInput(URI.file('foo/bar/inactive'), TEST_EDITOR_INPUT_ID); await group.openEditors([{ editor: input, options: { pinned: true } }, { editor: inputInactive }]); - const waitForEditorWillOpen = new Promise(c => { - Event.once(rightGroup.onWillOpenEditor)(e => c(e.context)); + const waitForEditorWillOpen = new Promise(resolve => { + Event.once(rightGroup.onWillOpenEditor)(e => resolve(e.context)); }); group.copyEditor(inputInactive, rightGroup, { index: 0 }); diff --git a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts index bf8c715cb34..6e0820a85d7 100644 --- a/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts +++ b/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts @@ -92,11 +92,11 @@ suite('Untitled text editors', () => { }); function awaitDidChangeDirty(service: IUntitledTextEditorService): Promise { - return new Promise(c => { + return new Promise(resolve => { const listener = service.onDidChangeDirty(async model => { listener.dispose(); - c(model.resource); + resolve(model.resource); }); }); } diff --git a/src/vs/workbench/services/url/browser/urlService.ts b/src/vs/workbench/services/url/browser/urlService.ts index 120ad6973ea..9d3ef46d01f 100644 --- a/src/vs/workbench/services/url/browser/urlService.ts +++ b/src/vs/workbench/services/url/browser/urlService.ts @@ -47,7 +47,7 @@ export class BrowserURLService extends AbstractURLService { ) { super(); - this.provider = environmentService.options!.urlCallbackProvider; + this.provider = environmentService.options?.urlCallbackProvider; this.registerListeners(); }