ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-23 09:35:39 -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

10
src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts
View File

@@ -46,7 +46,7 @@ export class DeleteAction extends Action {
super(id, label);
}
public async run(element: QueryHistoryNode): Promise<void> {
public override async run(element: QueryHistoryNode): Promise<void> {
if (element instanceof QueryHistoryNode && element.info) {
this._queryHistoryService.deleteQueryHistoryInfo(element.info);
}
@@ -65,7 +65,7 @@ export class ClearHistoryAction extends Action {
super(id, label, 'clear-query-history-action codicon-clear-all');
}
public async run(): Promise<void> {
public override async run(): Promise<void> {
return this._commandService.executeCommand('queryHistory.clear');
}
}
@@ -83,7 +83,7 @@ export class OpenQueryAction extends Action {
super(id, label);
}
public async run(element: QueryHistoryNode): Promise<void> {
public override async run(element: QueryHistoryNode): Promise<void> {
if (element instanceof QueryHistoryNode && element.info) {
return this._instantiationService.invokeFunction(openNewQuery, element.info.connectionProfile, element.info.queryText, RunQueryOnConnectionMode.none).then();
}
@@ -102,7 +102,7 @@ export class RunQueryAction extends Action {
super(id, label);
}
public async run(element: QueryHistoryNode): Promise<void> {
public override async run(element: QueryHistoryNode): Promise<void> {
if (element instanceof QueryHistoryNode && element.info) {
return this._instantiationService.invokeFunction(openNewQuery, element.info.connectionProfile, element.info.queryText, RunQueryOnConnectionMode.executeQuery).then();
}
@@ -124,7 +124,7 @@ export class ToggleQueryHistoryCaptureAction extends Action {
this._register(queryHistoryService.onQueryHistoryCaptureChanged((captureEnabled: boolean) => { this.setClassAndLabel(captureEnabled); }));
}
public async run(): Promise<void> {
public override async run(): Promise<void> {
return this._commandService.executeCommand('queryHistory.toggleCapture');
}

12
src/sql/workbench/contrib/queryHistory/browser/queryHistoryController.ts
View File

@@ -24,31 +24,31 @@ export class QueryHistoryController extends treeDefaults.DefaultController {
super({ clickBehavior: treeDefaults.ClickBehavior.ON_MOUSE_DOWN });
}
public onClick(tree: ITree, element: any, event: IMouseEvent): boolean {
public override onClick(tree: ITree, element: any, event: IMouseEvent): boolean {
return super.onClick(tree, element, event);
}
protected onLeftClick(tree: ITree, element: any, event: IMouseEvent, origin: string = 'mouse'): boolean {
protected override onLeftClick(tree: ITree, element: any, event: IMouseEvent, origin: string = 'mouse'): boolean {
return super.onLeftClick(tree, element, event, origin);
}
// Do not allow left / right to expand and collapse groups #7848
protected onLeft(tree: ITree, event: IKeyboardEvent): boolean {
protected override onLeft(tree: ITree, event: IKeyboardEvent): boolean {
return true;
}
protected onRight(tree: ITree, event: IKeyboardEvent): boolean {
protected override onRight(tree: ITree, event: IKeyboardEvent): boolean {
return true;
}
protected onEnter(tree: ITree, event: IKeyboardEvent): boolean {
protected override onEnter(tree: ITree, event: IKeyboardEvent): boolean {
return super.onEnter(tree, event);
}
/**
* Return actions in the context menu
*/
public onContextMenu(tree: ITree, element: any, event: ContextMenuEvent): boolean {
public override onContextMenu(tree: ITree, element: any, event: ContextMenuEvent): boolean {
if (event.target && event.target.tagName && event.target.tagName.toLowerCase() === 'input') {
return false;
}

6
src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts
View File

@@ -58,7 +58,7 @@ export class QueryHistoryView extends ViewPane {
/**
* Render the view body
*/
public renderBody(container: HTMLElement): void {
public override renderBody(container: HTMLElement): void {
// Add div to display no task executed message
this._messages = append(container, $('div.no-queries-message'));
@@ -137,14 +137,14 @@ export class QueryHistoryView extends ViewPane {
/**
* set the layout of the view
*/
public layout(height: number): void {
public override layout(height: number): void {
this._tree.layout(height);
}
/**
* set the visibility of the view
*/
public setVisible(visible: boolean): void {
public override setVisible(visible: boolean): void {
if (visible) {
this._tree.onVisible();
} else {