From b19b7a7f412561f06ee7aa631bb170e819ed258e Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 4 May 2020 09:44:53 +0200 Subject: [PATCH] es6 - use more find over filter --- src/vs/code/electron-main/window.ts | 2 +- src/vs/code/node/cliProcessMain.ts | 2 +- .../electron-browser/diskFileService.test.ts | 2 +- .../electron-main/windowsMainService.ts | 4 ++-- src/vs/platform/windows/node/window.ts | 2 +- .../workbench/api/common/extHostQuickOpen.ts | 21 +++++++++---------- src/vs/workbench/browser/composite.ts | 2 +- .../browser/parts/editor/editorControl.ts | 2 +- 8 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index f770c57c05fc3..2cdb6b90d6df3 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -937,7 +937,7 @@ export class CodeWindow extends Disposable implements ICodeWindow { // Multi Montior (fullscreen): try to find the previously used display if (state.display && state.mode === WindowMode.Fullscreen) { - const display = displays.filter(d => d.id === state.display)[0]; + const display = displays.find(d => d.id === state.display); if (display && typeof display.bounds?.x === 'number' && typeof display.bounds?.y === 'number') { this.logService.trace('window#validateWindowState: restoring fullscreen to previous display'); diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 660dc4e848479..ddbfcd5e8c7f1 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -216,7 +216,7 @@ export class Main { const extensionIdentifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) }; const installedExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User); - const newer = installedExtensions.filter(local => areSameExtensions(extensionIdentifier, local.identifier) && semver.gt(local.manifest.version, manifest.version))[0]; + const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semver.gt(local.manifest.version, manifest.version)); if (newer && !force) { console.log(localize('forceDowngrade', "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.identifier.id, newer.manifest.version, manifest.version)); diff --git a/src/vs/platform/files/test/electron-browser/diskFileService.test.ts b/src/vs/platform/files/test/electron-browser/diskFileService.test.ts index da809c89c4ecd..803ff185ab987 100644 --- a/src/vs/platform/files/test/electron-browser/diskFileService.test.ts +++ b/src/vs/platform/files/test/electron-browser/diskFileService.test.ts @@ -441,7 +441,7 @@ suite('Disk File Service', function () { assert.equal(resolved.isDirectory, true); assert.equal(resolved.children!.length, 9); - const resolvedLink = resolved.children?.filter(child => child.name === 'bar' && child.isSymbolicLink)[0]; + const resolvedLink = resolved.children?.find(child => child.name === 'bar' && child.isSymbolicLink); assert.ok(resolvedLink); assert.ok(!resolvedLink?.isDirectory); diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts index 5191a0366d7b1..266c235a0fef9 100644 --- a/src/vs/platform/windows/electron-main/windowsMainService.ts +++ b/src/vs/platform/windows/electron-main/windowsMainService.ts @@ -318,7 +318,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic if (!currentWindowsState.lastActiveWindow) { let activeWindow = this.getLastActiveWindow(); if (!activeWindow || activeWindow.isExtensionDevelopmentHost) { - activeWindow = WindowsMainService.WINDOWS.filter(window => !window.isExtensionDevelopmentHost)[0]; + activeWindow = WindowsMainService.WINDOWS.find(window => !window.isExtensionDevelopmentHost); } if (activeWindow) { @@ -327,7 +327,7 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic } // 2.) Find extension host window - const extensionHostWindow = WindowsMainService.WINDOWS.filter(window => window.isExtensionDevelopmentHost && !window.isExtensionTestHost)[0]; + const extensionHostWindow = WindowsMainService.WINDOWS.find(window => window.isExtensionDevelopmentHost && !window.isExtensionTestHost); if (extensionHostWindow) { currentWindowsState.lastPluginDevelopmentHostWindow = this.toWindowState(extensionHostWindow); } diff --git a/src/vs/platform/windows/node/window.ts b/src/vs/platform/windows/node/window.ts index 051be14afd596..cf737ec23b471 100644 --- a/src/vs/platform/windows/node/window.ts +++ b/src/vs/platform/windows/node/window.ts @@ -168,7 +168,7 @@ function findWindowOnFilePath(windows: W[], fileUri: U export function getLastActiveWindow(windows: W[]): W | undefined { const lastFocusedDate = Math.max.apply(Math, windows.map(window => window.lastFocusTime)); - return windows.filter(window => window.lastFocusTime === lastFocusedDate)[0]; + return windows.find(window => window.lastFocusTime === lastFocusedDate); } export function findWindowOnWorkspace(windows: W[], workspace: (IWorkspaceIdentifier | ISingleFolderWorkspaceIdentifier)): W | null { diff --git a/src/vs/workbench/api/common/extHostQuickOpen.ts b/src/vs/workbench/api/common/extHostQuickOpen.ts index fa1aca30a2084..1a87b23acb6a4 100644 --- a/src/vs/workbench/api/common/extHostQuickOpen.ts +++ b/src/vs/workbench/api/common/extHostQuickOpen.ts @@ -159,17 +159,16 @@ export class ExtHostQuickOpen implements ExtHostQuickOpenShape { // ---- workspace folder picker - showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token = CancellationToken.None): Promise { - return this._commands.executeCommand('_workbench.pickWorkspaceFolder', [options]).then(async (selectedFolder: WorkspaceFolder) => { - if (!selectedFolder) { - return undefined; - } - const workspaceFolders = await this._workspace.getWorkspaceFolders2(); - if (!workspaceFolders) { - return undefined; - } - return workspaceFolders.filter(folder => folder.uri.toString() === selectedFolder.uri.toString())[0]; - }); + async showWorkspaceFolderPick(options?: WorkspaceFolderPickOptions, token = CancellationToken.None): Promise { + const selectedFolder = await this._commands.executeCommand('_workbench.pickWorkspaceFolder', [options]); + if (!selectedFolder) { + return undefined; + } + const workspaceFolders = await this._workspace.getWorkspaceFolders2(); + if (!workspaceFolders) { + return undefined; + } + return workspaceFolders.find(folder => folder.uri.toString() === selectedFolder.uri.toString()); } // ---- QuickInput diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts index d8651c82b0158..0cb69cba7d46d 100644 --- a/src/vs/workbench/browser/composite.ts +++ b/src/vs/workbench/browser/composite.ts @@ -255,7 +255,7 @@ export abstract class CompositeRegistry extends Disposable private readonly _onDidDeregister = this._register(new Emitter>()); readonly onDidDeregister = this._onDidDeregister.event; - private composites: CompositeDescriptor[] = []; + private readonly composites: CompositeDescriptor[] = []; protected registerComposite(descriptor: CompositeDescriptor): void { if (this.compositeById(descriptor.id)) { diff --git a/src/vs/workbench/browser/parts/editor/editorControl.ts b/src/vs/workbench/browser/parts/editor/editorControl.ts index 6262b90a14a77..b0e2f9d4a37ce 100644 --- a/src/vs/workbench/browser/parts/editor/editorControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorControl.ts @@ -123,7 +123,7 @@ export class EditorControl extends Disposable { private doInstantiateEditorPane(descriptor: IEditorDescriptor): BaseEditor { // Return early if already instantiated - const existingEditorPane = this.editorPanes.filter(editorPane => descriptor.describes(editorPane))[0]; + const existingEditorPane = this.editorPanes.find(editorPane => descriptor.describes(editorPane)); if (existingEditorPane) { return existingEditorPane; }