ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update query editor taskbar on language flavor change (#13057)

Browse Source
This commit is contained in:
Charles Gagnon
2020-10-26 15:29:34 -07:00
committed by GitHub
parent 2db51ca243
commit 791dee1457
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/contrib/query/browser/flavorStatus.ts
View File

@@ -187,7 +187,7 @@ export class ChangeFlavorAction extends Action {
public run(): Promise<any> { public run(): Promise<any> {
let activeEditor = this._editorService.activeEditorPane; let activeEditor = this._editorService.activeEditorPane;
let currentUri = activeEditor?.input.resource?.toString(); let currentUri = activeEditor?.input.resource?.toString(true);
if (this._connectionManagementService.isConnected(currentUri)) { if (this._connectionManagementService.isConnected(currentUri)) {
let currentProvider = this._connectionManagementService.getProviderIdFromUri(currentUri); let currentProvider = this._connectionManagementService.getProviderIdFromUri(currentUri);
return this._showMessage(Severity.Info, nls.localize('alreadyConnected', return this._showMessage(Severity.Info, nls.localize('alreadyConnected',

38
src/sql/workbench/contrib/query/browser/queryEditor.ts
View File

@@ -196,6 +196,9 @@ export class QueryEditor extends EditorPane {
this.setTaskbarContent(); this.setTaskbarContent();
} }
})); }));
this._register(this.connectionManagementService.onLanguageFlavorChanged(() => {
this.setTaskbarContent();
}));
} }
/** /**
@@ -265,9 +268,11 @@ export class QueryEditor extends EditorPane {
const previewFeaturesEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures']; const previewFeaturesEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures'];
let connectionProfile = this.connectionManagementService.getConnectionProfile(this.input?.uri); let connectionProfile = this.connectionManagementService.getConnectionProfile(this.input?.uri);
let fileExtension = path.extname(this.input?.uri || ''); let fileExtension = path.extname(this.input?.uri || '');
const providerId = connectionProfile?.providerName ||
this.connectionManagementService.getProviderIdFromUri(this.input?.uri) ||
this.connectionManagementService.getDefaultProviderId();
// TODO: Make it more generic, some way for extensions to register the commands it supports // TODO: Make it more generic, some way for extensions to register the commands it supports
if ((!fileExtension && connectionProfile?.providerName === 'KUSTO') || this.modeService.getExtensions('Kusto').indexOf(fileExtension) > -1) { if ((providerId === 'KUSTO') || this.modeService.getExtensions('Kusto').indexOf(fileExtension) > -1) {
if (this.input instanceof UntitledQueryEditorInput) { // Sets proper language mode for untitled query editor based on the connection selected by user. if (this.input instanceof UntitledQueryEditorInput) { // Sets proper language mode for untitled query editor based on the connection selected by user.
this.input.setMode('kusto'); this.input.setMode('kusto');
} }
@@ -282,7 +287,6 @@ export class QueryEditor extends EditorPane {
]; ];
} }
else { else {
const notebookConvertActionsEnabled = this.configurationService.getValue('notebook')['showNotebookConvertActions'];
if (previewFeaturesEnabled) { if (previewFeaturesEnabled) {
content = [ content = [
{ action: this._runQueryAction }, { action: this._runQueryAction },
@@ -291,13 +295,18 @@ export class QueryEditor extends EditorPane {
{ action: this._toggleConnectDatabaseAction }, { action: this._toggleConnectDatabaseAction },
{ action: this._changeConnectionAction }, { action: this._changeConnectionAction },
{ action: this._listDatabasesAction }, { action: this._listDatabasesAction },
{ element: separator },
{ action: this._estimatedQueryPlanAction }, // Preview
{ action: this._toggleSqlcmdMode }, // Preview
]; ];
if (notebookConvertActionsEnabled) { if (providerId === 'MSSQL') {
content.push({ action: this._exportAsNotebookAction }); content.push({ element: separator },
{ action: this._estimatedQueryPlanAction }, // Preview
{ action: this._toggleSqlcmdMode } // Preview)
);
const notebookConvertActionsEnabled = this.configurationService.getValue('notebook')['showNotebookConvertActions'];
if (notebookConvertActionsEnabled) {
content.push({ action: this._exportAsNotebookAction });
}
} }
} else { } else {
content = [ content = [
@@ -308,11 +317,14 @@ export class QueryEditor extends EditorPane {
{ action: this._changeConnectionAction }, { action: this._changeConnectionAction },
{ action: this._listDatabasesAction } { action: this._listDatabasesAction }
]; ];
const notebookConvertActionsEnabled = this.configurationService.getValue('notebook')['notebook.showNotebookConvertActions'];
if (notebookConvertActionsEnabled) { if (providerId === 'MSSQL') {
content.push( const notebookConvertActionsEnabled = this.configurationService.getValue('notebook')['notebook.showNotebookConvertActions'];
{ element: separator }, if (notebookConvertActionsEnabled) {
{ action: this._exportAsNotebookAction }); content.push(
{ element: separator },
{ action: this._exportAsNotebookAction });
}
} }
} }
} }