Skip to content

Commit 7d8f9cf

Browse files
author
Benjamin Pasero
committed
es6 - use Array.find over find
1 parent 2e80a8f commit 7d8f9cf

8 files changed

Lines changed: 11 additions & 15 deletions

File tree

‎src/vs/code/electron-main/window.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
502502
}
503503

504504
private onWindowError(error: WindowError): void {
505-
this.logService.error(error === WindowError.CRASHED ? '[VS Code]: render process crashed!' : '[VS Code]: detected unresponsive');
505+
this.logService.error(error === WindowError.CRASHED ? '[VS Code]: renderer process crashed!' : '[VS Code]: detected unresponsive');
506506

507507
// If we run extension tests from CLI, showing a dialog is not
508508
// very helpful in this case. Rather, we bring down the test run

‎src/vs/platform/files/test/electron-browser/diskFileService.test.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ import { isLinux, isWindows } from 'vs/base/common/platform';
2121
import { DisposableStore } from 'vs/base/common/lifecycle';
2222
import { isEqual, joinPath } from 'vs/base/common/resources';
2323
import { VSBuffer, VSBufferReadable, streamToBufferReadableStream, VSBufferReadableStream, bufferToReadable, bufferToStream, streamToBuffer } from 'vs/base/common/buffer';
24-
import { find } from 'vs/base/common/arrays';
2524

2625
function getByName(root: IFileStat, name: string): IFileStat | undefined {
2726
if (root.children === undefined) {
2827
return undefined;
2928
}
3029

31-
return find(root.children, child => child.name === name);
30+
return root.children.find(child => child.name === name);
3231
}
3332

3433
function toLineByLineReadable(content: string): VSBufferReadable {

‎src/vs/workbench/browser/composite.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { trackFocus, Dimension } from 'vs/base/browser/dom';
1515
import { IStorageService } from 'vs/platform/storage/common/storage';
1616
import { Disposable } from 'vs/base/common/lifecycle';
1717
import { assertIsDefined } from 'vs/base/common/types';
18-
import { find } from 'vs/base/common/arrays';
1918

2019
/**
2120
* Composites are layed out in the sidebar and panel part of the workbench. At a time only one composite
@@ -286,6 +285,6 @@ export abstract class CompositeRegistry<T extends Composite> extends Disposable
286285
}
287286

288287
private compositeById(id: string): CompositeDescriptor<T> | undefined {
289-
return find(this.composites, composite => composite.id === id);
288+
return this.composites.find(composite => composite.id === id);
290289
}
291290
}

‎src/vs/workbench/browser/editor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
88
import { Registry } from 'vs/platform/registry/common/platform';
99
import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
1010
import { IConstructorSignature0, IInstantiationService, BrandedService } from 'vs/platform/instantiation/common/instantiation';
11-
import { find, insert } from 'vs/base/common/arrays';
11+
import { insert } from 'vs/base/common/arrays';
1212
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
1313

1414
export interface IEditorDescriptor {
@@ -154,7 +154,7 @@ class EditorRegistry implements IEditorRegistry {
154154
}
155155

156156
getEditorById(editorId: string): EditorDescriptor | undefined {
157-
return find(this.editors, editor => editor.getId() === editorId);
157+
return this.editors.find(editor => editor.getId() === editorId);
158158
}
159159

160160
getEditors(): readonly EditorDescriptor[] {

‎src/vs/workbench/browser/parts/editor/editorDropTarget.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { GroupDirection, MergeGroupMode } from 'vs/workbench/services/editor/com
1616
import { toDisposable } from 'vs/base/common/lifecycle';
1717
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1818
import { RunOnceScheduler } from 'vs/base/common/async';
19-
import { find } from 'vs/base/common/arrays';
2019
import { DataTransfers } from 'vs/base/browser/dnd';
2120
import { VSBuffer } from 'vs/base/common/buffer';
2221
import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
@@ -600,7 +599,7 @@ export class EditorDropTarget extends Themable {
600599

601600
private findTargetGroupView(child: HTMLElement): IEditorGroupView | undefined {
602601
const groups = this.accessor.groups;
603-
return find(groups, groupView => isAncestor(child, groupView.element) || this.delegate.groupContainsPredicate?.(groupView));
602+
return groups.find(groupView => isAncestor(child, groupView.element) || this.delegate.groupContainsPredicate?.(groupView));
604603
}
605604

606605
private updateContainer(isDraggedOver: boolean): void {

‎src/vs/workbench/browser/parts/editor/editorStatus.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessi
5050
import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
5151
import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment, IStatusbarEntry } from 'vs/workbench/services/statusbar/common/statusbar';
5252
import { IMarker, IMarkerService, MarkerSeverity, IMarkerData } from 'vs/platform/markers/common/markers';
53-
import { find } from 'vs/base/common/arrays';
5453
import { STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND } from 'vs/workbench/common/theme';
5554
import { themeColorFromId } from 'vs/platform/theme/common/themeService';
5655

@@ -969,7 +968,7 @@ class ShowCurrentMarkerInStatusbarContribution extends Disposable {
969968
if (!position) {
970969
return null;
971970
}
972-
return find(this.markers, marker => Range.containsPosition(marker, position)) || null;
971+
return this.markers.find(marker => Range.containsPosition(marker, position)) || null;
973972
}
974973

975974
private onMarkerChanged(changedResources: ReadonlyArray<URI>): void {

‎src/vs/workbench/browser/parts/statusbar/statusbarPart.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
2727
import { IStorageService, StorageScope, IWorkspaceStorageChangeEvent } from 'vs/platform/storage/common/storage';
2828
import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
2929
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
30-
import { coalesce, find } from 'vs/base/common/arrays';
30+
import { coalesce } from 'vs/base/common/arrays';
3131
import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
3232
import { ToggleStatusbarVisibilityAction } from 'vs/workbench/browser/actions/layoutActions';
3333
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
@@ -181,7 +181,7 @@ class StatusbarViewModel extends Disposable {
181181
}
182182

183183
findEntry(container: HTMLElement): IStatusbarViewModelEntry | undefined {
184-
return find(this._entries, entry => entry.container === container);
184+
return this._entries.find(entry => entry.container === container);
185185
}
186186

187187
getEntries(alignment: StatusbarAlignment): IStatusbarViewModelEntry[] {

‎src/vs/workbench/common/notifications.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Disposable, IDisposable, toDisposable } from 'vs/base/common/lifecycle'
1010
import { isPromiseCanceledError } from 'vs/base/common/errors';
1111
import { Action } from 'vs/base/common/actions';
1212
import { isErrorWithActions } from 'vs/base/common/errorsWithActions';
13-
import { find, equals } from 'vs/base/common/arrays';
13+
import { equals } from 'vs/base/common/arrays';
1414
import { parseLinkedText, LinkedText } from 'vs/base/common/linkedText';
1515

1616
export interface INotificationsModel {
@@ -220,7 +220,7 @@ export class NotificationsModel extends Disposable implements INotificationsMode
220220
}
221221

222222
private findNotification(item: INotificationViewItem): INotificationViewItem | undefined {
223-
return find(this._notifications, notification => notification.equals(item));
223+
return this._notifications.find(notification => notification.equals(item));
224224
}
225225

226226
private createViewItem(notification: INotification): INotificationViewItem | undefined {

0 commit comments

Comments
 (0)