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

22
src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts
View File

@@ -73,7 +73,7 @@ export class FocusOnCurrentQueryKeyboardAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor) {
editor.focus();
@@ -99,7 +99,7 @@ export class RunQueryKeyboardAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor || editor instanceof EditDataEditor) {
editor.runQuery();
@@ -124,7 +124,7 @@ export class RunCurrentQueryKeyboardAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor) {
editor.runCurrentQuery();
@@ -185,7 +185,7 @@ export class CopyQueryWithResultsKeyboardAction extends Action {
return { text: allResults, html: allHtmlResults };
}
public async run(): Promise<void> {
public override async run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor) {
let allResults = await this.getFormattedResults(editor);
@@ -219,7 +219,7 @@ export class RunCurrentQueryWithActualPlanKeyboardAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor) {
editor.runCurrentQueryWithActualPlan();
@@ -245,7 +245,7 @@ export class CancelQueryKeyboardAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor || editor instanceof EditDataEditor) {
editor.cancelQuery();
@@ -271,7 +271,7 @@ export class RefreshIntellisenseKeyboardAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this.editorService.activeEditor;
if (editor instanceof QueryEditorInput) {
this.connectionManagementService.rebuildIntelliSenseCache(editor.uri);
@@ -297,7 +297,7 @@ export class ToggleQueryResultsKeyboardAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor) {
editor.toggleResultsEditorVisibility();
@@ -324,7 +324,7 @@ export class ToggleFocusBetweenQueryEditorAndResultsAction extends Action {
this.enabled = true;
}
public async run(): Promise<void> {
public override async run(): Promise<void> {
const editor = this._editorService.activeEditorPane;
if (editor instanceof QueryEditor) {
editor.toggleFocusBetweenQueryEditorAndResults();
@@ -348,7 +348,7 @@ export class RunQueryShortcutAction extends Action {
super(RunQueryShortcutAction.ID);
}
public run(index: number): Promise<void> {
public override run(index: number): Promise<void> {
let promise: Thenable<void> = Promise.resolve(null);
runActionOnActiveQueryEditor(this.editorService, (editor) => {
promise = this.runQueryShortcut(editor, index);
@@ -508,7 +508,7 @@ export class ParseSyntaxAction extends Action {
this.enabled = true;
}
public run(): Promise<void> {
public override run(): Promise<void> {
const editor = this.editorService.activeEditorPane;
if (editor instanceof QueryEditor) {
if (!editor.isSelectionEmpty()) {