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

Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

Browse Source 
* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/base/browser/ui/taskbar/actionbar.ts
View File

@@ -3,12 +3,13 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { IAction, IActionRunner, ActionRunner, IActionViewItem } from 'vs/base/common/actions';
import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import {
IActionBarOptions, ActionsOrientation,
IActionOptions
IActionOptions,
IActionViewItem
} from 'vs/base/browser/ui/actionbar/actionbar';
import * as lifecycle from 'vs/base/common/lifecycle';
import * as DOM from 'vs/base/browser/dom';
@@ -365,11 +366,11 @@ export class ActionBar extends ActionRunner implements IActionRunner {
//this.emit('cancel');
}
public run(action: IAction, context?: any): Promise<any> {
public override run(action: IAction, context?: any): Promise<any> {
return this._actionRunner.run(action, context);
}
public dispose(): void {
public override dispose(): void {
lifecycle.dispose(this._items);
this._items = [];

21
src/sql/base/browser/ui/taskbar/overflowActionbar.ts
View File

@@ -2,12 +2,13 @@
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { IAction, IActionViewItem } from 'vs/base/common/actions';
import { IAction } from 'vs/base/common/actions';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import {
IActionBarOptions, ActionsOrientation,
IActionOptions
IActionOptions,
IActionViewItem
} from 'vs/base/browser/ui/actionbar/actionbar';
import * as DOM from 'vs/base/browser/dom';
import * as types from 'vs/base/common/types';
@@ -218,7 +219,7 @@ export class OverflowActionBar extends ActionBar {
this._focusedItem = this._actionsList.childElementCount - 1;
}
protected updateFocusedItem(): void {
protected override updateFocusedItem(): void {
let actionIndex = 0;
for (let i = 0; i < this._actionsList.children.length; i++) {
let elem = this._actionsList.children[i];
@@ -254,7 +255,7 @@ export class OverflowActionBar extends ActionBar {
* Push an HTML Element onto the action bar UI in the position specified by options.
* Pushes to the last position if no options are provided.
*/
public pushElement(element: HTMLElement, options: IActionOptions = {}): void {
public override pushElement(element: HTMLElement, options: IActionOptions = {}): void {
super.pushElement(element, options);
this.resizeToolbar();
}
@@ -263,12 +264,12 @@ export class OverflowActionBar extends ActionBar {
* Push an action onto the action bar UI in the position specified by options.
* Pushes to the last position if no options are provided.
*/
public pushAction(arg: IAction | IAction[], options: IActionOptions = {}): void {
public override pushAction(arg: IAction | IAction[], options: IActionOptions = {}): void {
super.pushAction(arg, options);
this.resizeToolbar();
}
protected focusNext(): void {
protected override focusNext(): void {
if (typeof this._focusedItem === 'undefined') {
this._focusedItem = this._items.length - 1;
}
@@ -288,7 +289,7 @@ export class OverflowActionBar extends ActionBar {
this.updateFocus();
}
protected focusPrevious(): void {
protected override focusPrevious(): void {
if (typeof this._focusedItem === 'undefined') {
this._focusedItem = 0;
}
@@ -313,7 +314,7 @@ export class OverflowActionBar extends ActionBar {
this.updateFocus();
}
protected updateFocus(): void {
protected override updateFocus(): void {
if (typeof this._focusedItem === 'undefined') {
this._domNode.focus();
return;
@@ -340,7 +341,7 @@ export class OverflowActionBar extends ActionBar {
}
}
protected cancel(): void {
protected override cancel(): void {
super.cancel();
if (this._overflow) {
@@ -348,7 +349,7 @@ export class OverflowActionBar extends ActionBar {
}
}
public run(action: IAction, context?: any): Promise<any> {
public override run(action: IAction, context?: any): Promise<any> {
this.hideOverflowDisplay();
return this._actionRunner.run(action, context);
}

4
src/sql/base/browser/ui/taskbar/taskbar.ts
View File

@@ -8,8 +8,8 @@ import 'vs/css!./media/icons';
import { ActionBar } from './actionbar';
import { IActionRunner, IAction, IActionViewItem } from 'vs/base/common/actions';
import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar';
import { IActionRunner, IAction } from 'vs/base/common/actions';
import { ActionsOrientation, IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
import { IToolBarOptions } from 'vs/base/browser/ui/toolbar/toolbar';
import { OverflowActionBar } from 'sql/base/browser/ui/taskbar/overflowActionbar';