Skip to content

Commit fcb916f

Browse files
bpaserobpasero
committed
debt - remove array.first (microsoft#103454)
1 parent 02cf31c commit fcb916f

4 files changed

Lines changed: 13 additions & 38 deletions

File tree

‎.vscode/searches/es6.code-search‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,26 @@
22
# Flags: CaseSensitive WordMatch
33
# ContextLines: 2
44

5-
12 results - 4 files
5+
10 results - 2 files
66

7-
src/vs/base/browser/dom.ts:
7+
monaco • src/vs/base/browser/dom.ts:
88
83 };
99
84
1010
85: /** @deprecated ES6 - use classList*/
11-
86 export const hasClass: (node: HTMLElement | SVGElement, className: string) => boolean = _classList.hasClass.bind(_classList);
11+
86 export function hasClass(node: HTMLElement | SVGElement, className: string): boolean { return _classList.hasClass(node, className); }
1212
87: /** @deprecated ES6 - use classList*/
13-
88 export const addClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.addClass.bind(_classList);
13+
88 export function addClass(node: HTMLElement | SVGElement, className: string): void { return _classList.addClass(node, className); }
1414
89: /** @deprecated ES6 - use classList*/
15-
90 export const addClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.addClasses.bind(_classList);
15+
90 export function addClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.addClasses(node, ...classNames); }
1616
91: /** @deprecated ES6 - use classList*/
17-
92 export const removeClass: (node: HTMLElement | SVGElement, className: string) => void = _classList.removeClass.bind(_classList);
17+
92 export function removeClass(node: HTMLElement | SVGElement, className: string): void { return _classList.removeClass(node, className); }
1818
93: /** @deprecated ES6 - use classList*/
19-
94 export const removeClasses: (node: HTMLElement | SVGElement, ...classNames: string[]) => void = _classList.removeClasses.bind(_classList);
19+
94 export function removeClasses(node: HTMLElement | SVGElement, ...classNames: string[]): void { return _classList.removeClasses(node, ...classNames); }
2020
95: /** @deprecated ES6 - use classList*/
21-
96 export const toggleClass: (node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean) => void = _classList.toggleClass.bind(_classList);
21+
96 export function toggleClass(node: HTMLElement | SVGElement, className: string, shouldHaveIt?: boolean): void { return _classList.toggleClass(node, className, shouldHaveIt); }
2222
97
2323

24-
src/vs/base/common/arrays.ts:
25-
401
26-
402 /**
27-
403: * @deprecated ES6: use `Array.find`
28-
404 */
29-
405 export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
30-
31-
src/vs/base/common/objects.ts:
32-
115
33-
116 /**
34-
117: * @deprecated ES6
35-
118 */
36-
119 export function assign<T>(destination: T): T;
37-
38-
src/vs/base/common/strings.ts:
24+
monaco • src/vs/base/common/strings.ts:
3925
15
4026
16 /**
4127
17: * @deprecated ES6: use `String.padStart`

‎src/vs/base/common/arrays.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -399,16 +399,6 @@ export function lastIndex<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean):
399399
return -1;
400400
}
401401

402-
/**
403-
* @deprecated ES6: use `Array.find`
404-
*/
405-
export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
406-
export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean): T | undefined;
407-
export function first<T>(array: ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T | undefined = undefined): T | undefined {
408-
const index = array.findIndex(fn);
409-
return index < 0 ? notFoundValue : array[index];
410-
}
411-
412402
export function firstOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue: NotFound): T | NotFound;
413403
export function firstOrDefault<T>(array: ReadonlyArray<T>): T | undefined;
414404
export function firstOrDefault<T, NotFound = T>(array: ReadonlyArray<T>, notFoundValue?: NotFound): T | NotFound | undefined {

‎src/vs/base/common/glob.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import * as arrays from 'vs/base/common/arrays';
76
import * as strings from 'vs/base/common/strings';
87
import * as extpath from 'vs/base/common/extpath';
98
import * as paths from 'vs/base/common/path';
@@ -382,7 +381,7 @@ function trivia3(pattern: string, options: IGlobOptions): ParsedStringPattern {
382381
}
383382
return null;
384383
};
385-
const withBasenames = arrays.first(parsedPatterns, pattern => !!(<ParsedStringPattern>pattern).allBasenames);
384+
const withBasenames = parsedPatterns.find(pattern => !!(<ParsedStringPattern>pattern).allBasenames);
386385
if (withBasenames) {
387386
parsedPattern.allBasenames = (<ParsedStringPattern>withBasenames).allBasenames;
388387
}
@@ -552,7 +551,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
552551
return null;
553552
};
554553

555-
const withBasenames = arrays.first(parsedPatterns, pattern => !!(<ParsedStringPattern>pattern).allBasenames);
554+
const withBasenames = parsedPatterns.find(pattern => !!(<ParsedStringPattern>pattern).allBasenames);
556555
if (withBasenames) {
557556
resultExpression.allBasenames = (<ParsedStringPattern>withBasenames).allBasenames;
558557
}
@@ -588,7 +587,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
588587
return null;
589588
};
590589

591-
const withBasenames = arrays.first(parsedPatterns, pattern => !!(<ParsedStringPattern>pattern).allBasenames);
590+
const withBasenames = parsedPatterns.find(pattern => !!(<ParsedStringPattern>pattern).allBasenames);
592591
if (withBasenames) {
593592
resultExpression.allBasenames = (<ParsedStringPattern>withBasenames).allBasenames;
594593
}

‎src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ class WelcomePage extends Disposable {
462462
extensionId: extensionSuggestion.id,
463463
});
464464
this.instantiationService.invokeFunction(getInstalledExtensions).then(extensions => {
465-
const installedExtension = arrays.first(extensions, extension => areSameExtensions(extension.identifier, { id: extensionSuggestion.id }));
465+
const installedExtension = extensions.find(extension => areSameExtensions(extension.identifier, { id: extensionSuggestion.id }));
466466
if (installedExtension && installedExtension.globallyEnabled) {
467467
/* __GDPR__FRAGMENT__
468468
"WelcomePageInstalled-1" : {

0 commit comments

Comments
 (0)