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

fix language change issue (#18906)

Browse Source
This commit is contained in:
Alan Ren
2022-04-01 17:52:11 -07:00
committed by GitHub
parent 055f10ff8d
commit a795e64bed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/base/query/browser/untitledQueryEditorInput.ts
View File

@@ -34,6 +34,10 @@ export class UntitledQueryEditorInput extends QueryEditorInput implements IUntit
@IInstantiationService instantiationService: IInstantiationService, @IInstantiationService instantiationService: IInstantiationService,
) { ) {
super(description, text, results, connectionManagementService, queryModelService, configurationService, instantiationService); super(description, text, results, connectionManagementService, queryModelService, configurationService, instantiationService);
// Set the mode explicitely to stop the auto language detection service from changing the mode unexpectedly.
// the auto language detection service won't do the language change only if the mode is explicitely set.
// if the mode (e.g. kusto, sql) do not exist for whatever reason, we will default it to sql.
text.setMode(text.getMode() ?? 'sql');
} }
public override resolve(): Promise<IUntitledTextEditorModel & IResolvedTextEditorModel> { public override resolve(): Promise<IUntitledTextEditorModel & IResolvedTextEditorModel> {

4
src/sql/workbench/services/queryEditor/browser/queryEditorService.ts
View File

@@ -59,10 +59,6 @@ export class QueryEditorService implements IQueryEditorService {
// Create a sql document pane with accoutrements // Create a sql document pane with accoutrements
const mode = this._connectionManagementService.getProviderLanguageMode(connectionProviderName); const mode = this._connectionManagementService.getProviderLanguageMode(connectionProviderName);
const fileInput = this._editorService.createEditorInput({ forceUntitled: true, resource: docUri, mode: mode }) as UntitledTextEditorInput; const fileInput = this._editorService.createEditorInput({ forceUntitled: true, resource: docUri, mode: mode }) as UntitledTextEditorInput;
// Set the mode explicitely to stop the language detection service from changing the mode unexpectedly.
// The mode parameter used when creating the editorInput is used as preferred mode,
// the language detection service won't do the language change only if the mode is explicitely set.
fileInput.setMode(mode);
let untitledEditorModel = await fileInput.resolve(); let untitledEditorModel = await fileInput.resolve();
if (options.initalContent) { if (options.initalContent) {
untitledEditorModel.textEditorModel.setValue(options.initalContent); untitledEditorModel.textEditorModel.setValue(options.initalContent);