Skip to content

Commit f922e8b

Browse files
authored
debt - remove lib.array-ext.d.ts and support Array.includes (fix microsoft#102566) (microsoft#105404)
1 parent 0681925 commit f922e8b

File tree

8 files changed

+9
-20
lines changed

8 files changed

+9
-20
lines changed

src/tsconfig.base.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
},
1717
"lib": [
1818
"ES2015",
19+
"ES2016.Array.Include",
1920
"ES2017.String",
2021
"ES2018.Promise",
2122
"DOM",

src/tsconfig.monaco.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"include": [
1616
"typings/require.d.ts",
1717
"typings/thenable.d.ts",
18-
"typings/lib.array-ext.d.ts",
1918
"vs/css.d.ts",
2019
"vs/monaco.d.ts",
2120
"vs/nls.d.ts",

src/typings/lib.array-ext.d.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/vs/platform/actions/browser/menuEntryActionViewItem.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ function fillInActions(groups: ReadonlyArray<[string, ReadonlyArray<MenuItemActi
110110
}
111111

112112
if (isPrimaryGroup(group)) {
113-
const to = Array.isArray<IAction>(target) ? target : target.primary;
113+
const to = Array.isArray(target) ? target : target.primary;
114114

115115
to.unshift(...actions);
116116
} else {
117-
const to = Array.isArray<IAction>(target) ? target : target.secondary;
117+
const to = Array.isArray(target) ? target : target.secondary;
118118

119119
if (to.length > 0) {
120120
to.push(new Separator());

src/vs/workbench/api/common/extHostLanguageFeatures.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ class ColorProviderAdapter {
11201120
provideColors(resource: URI, token: CancellationToken): Promise<extHostProtocol.IRawColorInfo[]> {
11211121
const doc = this._documents.getDocument(resource);
11221122
return asPromise(() => this._provider.provideDocumentColors(doc, token)).then(colors => {
1123-
if (!Array.isArray<vscode.ColorInformation>(colors)) {
1123+
if (!Array.isArray(colors)) {
11241124
return [];
11251125
}
11261126

src/vs/workbench/contrib/comments/browser/commentNode.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,11 +535,11 @@ function fillInActions(groups: [string, Array<MenuItemAction | SubmenuItemAction
535535
}
536536

537537
if (isPrimaryGroup(group)) {
538-
const to = Array.isArray<IAction>(target) ? target : target.primary;
538+
const to = Array.isArray(target) ? target : target.primary;
539539

540540
to.unshift(...actions);
541541
} else {
542-
const to = Array.isArray<IAction>(target) ? target : target.secondary;
542+
const to = Array.isArray(target) ? target : target.secondary;
543543

544544
if (to.length > 0) {
545545
to.push(new Separator());

src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
296296

297297
private getCachedRecommendations(): IStringDictionary<number> {
298298
let storedRecommendations = JSON.parse(this.storageService.get(recommendationsStorageKey, StorageScope.GLOBAL, '[]'));
299-
if (Array.isArray<string>(storedRecommendations)) {
299+
if (Array.isArray(storedRecommendations)) {
300300
storedRecommendations = storedRecommendations.reduce((result, id) => { result[id] = Date.now(); return result; }, <IStringDictionary<number>>{});
301301
}
302302
const result: IStringDictionary<number> = {};

src/vs/workbench/contrib/notebook/browser/view/renderers/cellActionView.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ function fillInActions(groups: ReadonlyArray<[string, ReadonlyArray<MenuItemActi
4545

4646
const isPrimary = isPrimaryGroup(group);
4747
if (isPrimary) {
48-
const to = Array.isArray<IAction>(target) ? target : target.primary;
48+
const to = Array.isArray(target) ? target : target.primary;
4949

5050
if (to.length > 0) {
5151
to.push(new VerticalSeparator());
@@ -55,7 +55,7 @@ function fillInActions(groups: ReadonlyArray<[string, ReadonlyArray<MenuItemActi
5555
}
5656

5757
if (!isPrimary || alwaysFillSecondary) {
58-
const to = Array.isArray<IAction>(target) ? target : target.secondary;
58+
const to = Array.isArray(target) ? target : target.secondary;
5959

6060
if (to.length > 0) {
6161
to.push(new Separator());

0 commit comments

Comments
 (0)