From fcb916f02c49a05a841663f319b8d9dbb3ee2daa Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 16 Sep 2020 14:20:25 +0200 Subject: [PATCH] debt - remove array.first (#103454) --- .vscode/searches/es6.code-search | 32 ++++++------------- src/vs/base/common/arrays.ts | 10 ------ src/vs/base/common/glob.ts | 7 ++-- .../welcome/page/browser/welcomePage.ts | 2 +- 4 files changed, 13 insertions(+), 38 deletions(-) diff --git a/.vscode/searches/es6.code-search b/.vscode/searches/es6.code-search index 1e1bdd94188..7b8a30e8dba 100644 --- a/.vscode/searches/es6.code-search +++ b/.vscode/searches/es6.code-search @@ -2,40 +2,26 @@ # Flags: CaseSensitive WordMatch # ContextLines: 2 -12 results - 4 files +10 results - 2 files -src/vs/base/browser/dom.ts: +monaco • src/vs/base/browser/dom.ts: 83 }; 84 85: /** @deprecated ES6 - use classList*/ - 86 export const hasClass: (node: HTMLElement | SVGElement, className: string) => boolean = _classList.hasClass.bind(_classList); + 86 export function hasClass(node: HTMLElement | SVGElement, className: string): boolean { return _classList.hasClass(node, className); } 87: /** @deprecated ES6 - use classList*/ - 88 export const addClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.addClass.bind(_classList); + 88 export function addClass(node: HTMLElement | SVGElement, className: string): void { return _classList.addClass(node, className); } 89: /** @deprecated ES6 - use classList*/ - 90 export const addClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.addClasses.bind(_classList); + 90 export function addClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.addClasses(node, ...classNames); } 91: /** @deprecated ES6 - use classList*/ - 92 export const removeClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.removeClass.bind(_classList); + 92 export function removeClass(node: HTMLElement | SVGElement, className: string): void { return _classList.removeClass(node, className); } 93: /** @deprecated ES6 - use classList*/ - 94 export const removeClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.removeClasses.bind(_classList); + 94 export function removeClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.removeClasses(node, ...classNames); } 95: /** @deprecated ES6 - use classList*/ - 96 export const toggleClass: (node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean) => void = _classList.toggleClass.bind(_classList); + 96 export function toggleClass(node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean): void { return _classList.toggleClass(node, className, shouldHaveIt); } 97 -src/vs/base/common/arrays.ts: - 401 - 402 /** - 403: * @deprecated ES6: use `Array.find` - 404 */ - 405 export function first(array: ReadonlyArray, fn: (item: T) => boolean, notFoundValue: T): T; - -src/vs/base/common/objects.ts: - 115 - 116 /** - 117: * @deprecated ES6 - 118 */ - 119 export function assign(destination: T): T; - -src/vs/base/common/strings.ts: +monaco • src/vs/base/common/strings.ts: 15 16 /** 17: * @deprecated ES6: use `String.padStart` diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts index a8160f25ce8..2b8904acceb 100644 --- a/src/vs/base/common/arrays.ts +++ b/src/vs/base/common/arrays.ts @@ -399,16 +399,6 @@ export function lastIndex(array: ReadonlyArray, fn: (item: T) => boolean): return -1; } -/** - * @deprecated ES6: use `Array.find` - */ -export function first(array: ReadonlyArray, fn: (item: T) => boolean, notFoundValue: T): T; -export function first(array: ReadonlyArray, fn: (item: T) => boolean): T | undefined; -export function first(array: ReadonlyArray, fn: (item: T) => boolean, notFoundValue: T | undefined = undefined): T | undefined { - const index = array.findIndex(fn); - return index < 0 ? notFoundValue : array[index]; -} - export function firstOrDefault(array: ReadonlyArray, notFoundValue: NotFound): T | NotFound; export function firstOrDefault(array: ReadonlyArray): T | undefined; export function firstOrDefault(array: ReadonlyArray, notFoundValue?: NotFound): T | NotFound | undefined { diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts index 5947cb70276..b8aaab0a049 100644 --- a/src/vs/base/common/glob.ts +++ b/src/vs/base/common/glob.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as arrays from 'vs/base/common/arrays'; import * as strings from 'vs/base/common/strings'; import * as extpath from 'vs/base/common/extpath'; import * as paths from 'vs/base/common/path'; @@ -382,7 +381,7 @@ function trivia3(pattern: string, options: IGlobOptions): ParsedStringPattern { } return null; }; - const withBasenames = arrays.first(parsedPatterns, pattern => !!(pattern).allBasenames); + const withBasenames = parsedPatterns.find(pattern => !!(pattern).allBasenames); if (withBasenames) { parsedPattern.allBasenames = (withBasenames).allBasenames; } @@ -552,7 +551,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse return null; }; - const withBasenames = arrays.first(parsedPatterns, pattern => !!(pattern).allBasenames); + const withBasenames = parsedPatterns.find(pattern => !!(pattern).allBasenames); if (withBasenames) { resultExpression.allBasenames = (withBasenames).allBasenames; } @@ -588,7 +587,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse return null; }; - const withBasenames = arrays.first(parsedPatterns, pattern => !!(pattern).allBasenames); + const withBasenames = parsedPatterns.find(pattern => !!(pattern).allBasenames); if (withBasenames) { resultExpression.allBasenames = (withBasenames).allBasenames; } diff --git a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts index aa95aa602b5..8d93275942a 100644 --- a/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts +++ b/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts @@ -462,7 +462,7 @@ class WelcomePage extends Disposable { extensionId: extensionSuggestion.id, }); this.instantiationService.invokeFunction(getInstalledExtensions).then(extensions => { - const installedExtension = arrays.first(extensions, extension => areSameExtensions(extension.identifier, { id: extensionSuggestion.id })); + const installedExtension = extensions.find(extension => areSameExtensions(extension.identifier, { id: extensionSuggestion.id })); if (installedExtension && installedExtension.globallyEnabled) { /* __GDPR__FRAGMENT__ "WelcomePageInstalled-1" : {