Remove typings and replace missing methods with vscodes (#8217)

* remove typings and replace missing methods with vscodes

* fix strict-null-checks

* fix tests
This commit is contained in:
Anthony Dresser
2019-11-05 13:03:20 -08:00
committed by GitHub
parent 4645a8ba6b
commit 22a427f934
184 changed files with 634 additions and 43388 deletions

View File

@@ -18,6 +18,7 @@ import * as types from 'vs/base/common/types';
import { mixin } from 'vs/base/common/objects';
import { Disposable } from 'vs/base/common/lifecycle';
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
import { firstIndex } from 'vs/base/common/arrays';
export interface IPanelOptions {
/**
@@ -202,7 +203,7 @@ export class PanelComponent extends Disposable {
* Select on the next tab
*/
public selectOnNextTab(): void {
let activeIndex = this._tabs.toArray().findIndex(i => i === this._activeTab);
let activeIndex = firstIndex(this._tabs.toArray(), i => i === this._activeTab);
let nextTabIndex = activeIndex + 1;
if (nextTabIndex === this._tabs.length) {
nextTabIndex = 0;
@@ -211,7 +212,7 @@ export class PanelComponent extends Disposable {
}
private findAndRemoveTabFromMRU(tab: TabComponent): void {
let mruIndex = this._mru.findIndex(i => i === tab);
let mruIndex = firstIndex(this._mru, i => i === tab);
if (mruIndex !== -1) {
// Remove old index

View File

@@ -15,6 +15,7 @@ import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { Color } from 'vs/base/common/color';
import { isUndefinedOrNull } from 'vs/base/common/types';
import * as map from 'vs/base/common/map';
import { firstIndex } from 'vs/base/common/arrays';
export interface ITabbedPanelStyles {
titleActiveForeground?: Color;
@@ -171,11 +172,11 @@ export class TabbedPanel extends Disposable {
e.stopImmediatePropagation();
}
if (event.equals(KeyCode.RightArrow)) {
let currentIndex = this._tabOrder.findIndex(x => x === tab.tab.identifier);
let currentIndex = firstIndex(this._tabOrder, x => x === tab.tab.identifier);
this.focusNextTab(currentIndex + 1);
}
if (event.equals(KeyCode.LeftArrow)) {
let currentIndex = this._tabOrder.findIndex(x => x === tab.tab.identifier);
let currentIndex = firstIndex(this._tabOrder, x => x === tab.tab.identifier);
this.focusNextTab(currentIndex - 1);
}
if (event.equals(KeyCode.Tab)) {
@@ -191,8 +192,7 @@ export class TabbedPanel extends Disposable {
const insertBefore = !isUndefinedOrNull(index) ? this.tabList.children.item(index) : undefined;
if (insertBefore) {
this._tabOrder.copyWithin(index! + 1, index!);
this._tabOrder[index!] = tab.tab.identifier;
this._tabOrder.splice(index!, 0, tab.tab.identifier);
this.tabList.insertBefore(tabHeaderElement, insertBefore);
} else {
this.tabList.append(tabHeaderElement);
@@ -267,7 +267,7 @@ export class TabbedPanel extends Disposable {
}
actualTab.disposables.dispose();
this._tabMap.delete(tab);
let index = this._tabOrder.findIndex(t => t === tab);
let index = firstIndex(this._tabOrder, t => t === tab);
this._tabOrder.splice(index, 1);
if (this._shownTabId === tab) {
this._shownTabId = undefined;

View File

@@ -136,7 +136,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
this.workingFilters = columnDef.filterValues.slice(0);
for (let i = 0; i < filterItems.length; i++) {
const filtered = _.contains(this.workingFilters, filterItems[i]);
const filtered = this.workingFilters.some(x => x === filterItems[i]);
filterOptions += '<label><input type="checkbox" value="' + i + '"'
+ (filtered ? ' checked="checked"' : '')
@@ -184,7 +184,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
let filterOptions = '<label><input type="checkbox" value="-1" />(Select All)</label>';
for (let i = 0; i < filterItems.length; i++) {
const filtered = _.contains(this.workingFilters, filterItems[i]);
const filtered = this.workingFilters.some(x => x === filterItems[i]);
if (filterItems[i] && filterItems[i].indexOf('Error:') < 0) {
filterOptions += '<label><input type="checkbox" value="' + i + '"'
+ (filtered ? ' checked="checked"' : '')
@@ -282,7 +282,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
workingFilters.length = 0;
}
} else {
const index = _.indexOf(workingFilters, filterItems[value]);
const index = workingFilters.indexOf(filterItems[value]);
if ($checkbox.prop('checked') && index < 0) {
workingFilters.push(filterItems[value]);
@@ -326,7 +326,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
for (let i = 0; i < dataView.getLength(); i++) {
const value = dataView.getItem(i)[column.field!];
if (!_.contains(seen, value)) {
if (!seen.some(x => x === value)) {
seen.push(value);
}
}
@@ -346,18 +346,18 @@ export class HeaderFilter<T extends Slick.SlickData> {
const itemValue = !value ? '' : value;
const lowercaseFilter = filter.toString().toLowerCase();
const lowercaseVal = itemValue.toString().toLowerCase();
if (!_.contains(seen, value) && lowercaseVal.indexOf(lowercaseFilter) > -1) {
if (!seen.some(x => x === value) && lowercaseVal.indexOf(lowercaseFilter) > -1) {
seen.push(value);
}
}
else {
if (!_.contains(seen, value)) {
if (!seen.some(x => x === value)) {
seen.push(value);
}
}
}
return _.sortBy(seen, (v) => { return v; });
return seen.sort((v) => { return v; });
}
private getAllFilterValues(data: Array<Slick.SlickData>, column: Slick.Column<T>) {
@@ -365,12 +365,12 @@ export class HeaderFilter<T extends Slick.SlickData> {
for (let i = 0; i < data.length; i++) {
const value = data[i][column.field!];
if (!_.contains(seen, value)) {
if (!seen.some(x => x === value)) {
seen.push(value);
}
}
return _.sortBy(seen, (v) => { return v; });
return seen.sort((v) => { return v; });
}
private handleMenuItemClick(e: JQuery.Event<HTMLElement, null>, command: string, columnDef: Slick.Column<T>) {