ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 17:22:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode fcf3346a8e9f5ee1e00674461d9e2c2292a14ee3 (#12295)

Browse Source 
* Merge from vscode fcf3346a8e9f5ee1e00674461d9e2c2292a14ee3

* Fix test build break

* Update distro

* Fix build errors

* Update distro

* Update REH build file

* Update build task names for REL

* Fix product build yaml

* Fix product REH task name

* Fix type in task name

* Update linux build step

* Update windows build tasks

* Turn off server publish

* Disable REH

* Fix typo

* Bump distro

* Update vscode tests

* Bump distro

* Fix type in disto

* Bump distro

* Turn off docker build

* Remove docker step from release

Co-authored-by: ADS Merger <andresse@microsoft.com>
Co-authored-by: Karl Burtram <karlb@microsoft.com>
This commit is contained in:
Christopher Suh
2020-10-03 14:42:05 -04:00
committed by GitHub
parent 58d02b76db
commit 6ff1e3866b
687 changed files with 10507 additions and 9104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/base/browser/ui/buttonMenu/buttonMenu.ts
View File

@@ -64,18 +64,14 @@ export class DropdownMenuActionViewItem extends BaseActionViewItem {
return null;
};
const isActionsArray = Array.isArray(this.menuActionsOrProvider);
const options: IDropdownMenuOptions = {
contextMenuProvider: this.contextMenuProvider,
labelRenderer: labelRenderer
labelRenderer: labelRenderer,
actions: isActionsArray ? this.menuActionsOrProvider as IAction[] : undefined,
actionProvider: isActionsArray ? undefined : this.menuActionsOrProvider as IActionProvider
};
// Render the DropdownMenu around a simple action to toggle it
if (Array.isArray(this.menuActionsOrProvider)) {
options.actions = this.menuActionsOrProvider;
} else {
options.actionProvider = this.menuActionsOrProvider as IActionProvider;
}
this.dropdownMenu = this._register(new DropdownMenu(container, options));
this.dropdownMenu.menuOptions = {
actionViewItemProvider: this.actionViewItemProvider,

5
src/sql/base/browser/ui/panel/panel.component.ts
View File

@@ -18,7 +18,6 @@ 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';
import * as nls from 'vs/nls';
import { TabHeaderComponent } from 'sql/base/browser/ui/panel/tabHeader.component';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -250,7 +249,7 @@ export class PanelComponent extends Disposable implements IThemable {
* Select on the next tab
*/
public selectOnNextTab(): void {
let activeIndex = firstIndex(this._tabs.toArray(), i => i === this._activeTab);
let activeIndex = this._tabs.toArray().findIndex(i => i === this._activeTab);
let nextTabIndex = activeIndex + 1;
if (nextTabIndex === this._tabs.length) {
nextTabIndex = 0;
@@ -284,7 +283,7 @@ export class PanelComponent extends Disposable implements IThemable {
}
private findAndRemoveTabFromMRU(tab: TabComponent): void {
let mruIndex = firstIndex(this._mru, i => i === tab);
let mruIndex = this._mru.findIndex(i => i === tab);
if (mruIndex !== -1) {
// Remove old index

7
src/sql/base/browser/ui/panel/panel.ts
View File

@@ -14,7 +14,6 @@ import { KeyCode } from 'vs/base/common/keyCodes';
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { Color } from 'vs/base/common/color';
import { isUndefinedOrNull } from 'vs/base/common/types';
import { firstIndex } from 'vs/base/common/arrays';
export interface ITabbedPanelStyles {
titleActiveForeground?: Color;
@@ -176,11 +175,11 @@ export class TabbedPanel extends Disposable {
e.stopImmediatePropagation();
}
if (event.equals(KeyCode.RightArrow)) {
let currentIndex = firstIndex(this._tabOrder, x => x === tab.tab.identifier);
let currentIndex = this._tabOrder.findIndex(x => x === tab.tab.identifier);
this.focusNextTab(currentIndex + 1);
}
if (event.equals(KeyCode.LeftArrow)) {
let currentIndex = firstIndex(this._tabOrder, x => x === tab.tab.identifier);
let currentIndex = this._tabOrder.findIndex(x => x === tab.tab.identifier);
this.focusNextTab(currentIndex - 1);
}
if (event.equals(KeyCode.Tab)) {
@@ -271,7 +270,7 @@ export class TabbedPanel extends Disposable {
}
actualTab.disposables.dispose();
this._tabMap.delete(tab);
let index = firstIndex(this._tabOrder, t => t === tab);
let index = this._tabOrder.findIndex(t => t === tab);
this._tabOrder.splice(index, 1);
if (this._shownTabId === tab) {
this._shownTabId = undefined;

5
src/sql/base/browser/ui/table/highPerf/tableView.ts
View File

@@ -18,7 +18,6 @@ import { Range, IRange } from 'vs/base/common/range';
import { getOrDefault } from 'vs/base/common/objects';
import { memoize } from 'vs/base/common/decorators';
import { Sash, Orientation, ISashEvent as IBaseSashEvent } from 'vs/base/browser/ui/sash/sash';
import { firstIndex } from 'vs/base/common/arrays';
import { CellCache, ICell } from 'sql/base/browser/ui/table/highPerf/cellCache';
import { ITableRenderer, ITableDataSource, ITableMouseEvent, IStaticTableRenderer, ITableColumn } from 'sql/base/browser/ui/table/highPerf/table';
@@ -279,7 +278,7 @@ export class TableView<T> implements IDisposable {
}
private onSashStart({ sash, start }: ISashEvent<T>): void {
const index = firstIndex(this.columnSashs, item => item.sash === sash);
const index = this.columnSashs.findIndex(item => item.sash === sash);
const sizes = this.columns.map(i => i.width!);
const lefts = this.columns.map(i => i.left!);
this.sashDragState = { start, current: start, index, sizes, lefts };
@@ -506,7 +505,7 @@ export class TableView<T> implements IDisposable {
}
indexOfColumn(columnId: string): number | undefined {
return firstIndex(this.columns, v => v.id === columnId);
return this.columns.findIndex(v => v.id === columnId);
}
get renderHeight(): number {

9
src/sql/base/browser/ui/table/highPerf/tableWidget.ts
View File

@@ -8,7 +8,6 @@ import { ITableEvent, ITableRenderer, ITableMouseEvent, ITableContextMenuEvent,
import { IDisposable, dispose, DisposableStore } from 'vs/base/common/lifecycle';
import { memoize } from 'vs/base/common/decorators';
import { Event, Emitter, EventBufferer } from 'vs/base/common/event';
import { firstIndex, find } from 'vs/base/common/arrays';
import * as DOM from 'vs/base/browser/dom';
import { TableView, ITableViewOptions } from 'sql/base/browser/ui/table/highPerf/tableView';
import { ScrollEvent } from 'vs/base/common/scrollable';
@@ -52,7 +51,7 @@ class TraitRenderer<T> implements ITableRenderer<T, ITraitTemplateData>
}
renderCell(element: T, row: number, cell: number, columnId: string, templateData: ITraitTemplateData): void {
const renderedElementIndex = firstIndex(this.renderedElements, el => el.templateData === templateData);
const renderedElementIndex = this.renderedElements.findIndex(el => el.templateData === templateData);
if (renderedElementIndex >= 0) {
const rendered = this.renderedElements[renderedElementIndex];
@@ -68,14 +67,14 @@ class TraitRenderer<T> implements ITableRenderer<T, ITraitTemplateData>
renderIndexes(indexes: IGridRange[]): void {
for (const { index, templateData } of this.renderedElements) {
if (!!find(indexes, v => GridRange.containsPosition(v, index))) {
if (!!indexes.find(v => GridRange.containsPosition(v, index))) {
this.trait.renderIndex(index, templateData);
}
}
}
disposeTemplate(templateData: ITraitTemplateData): void {
const index = firstIndex(this.renderedElements, el => el.templateData === templateData);
const index = this.renderedElements.findIndex(el => el.templateData === templateData);
if (index < 0) {
return;
@@ -194,7 +193,7 @@ class Trait<T> implements IDisposable {
}
contains(index: GridPosition): boolean {
return !!find(this.indexes, v => GridRange.containsPosition(v, index));
return !!this.indexes.find(v => GridRange.containsPosition(v, index));
}
dispose() {