More file moves for layering fixes (#23893)

src/sql/workbench/browser/editor/query/untitledQueryEditorInput.ts

@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { QueryEditorInput } from 'sql/workbench/common/editor/query/queryEditorInput';
+import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResultsInput';
+import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
+import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel';
+
+import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
+import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
+import { EncodingMode } from 'vs/workbench/services/textfile/common/textfiles';
+import { GroupIdentifier, ISaveOptions, EditorInputCapabilities, IUntypedEditorInput, DEFAULT_EDITOR_ASSOCIATION, isEditorInputWithOptionsAndGroup } from 'vs/workbench/common/editor';
+import { FileQueryEditorInput } from 'sql/workbench/browser/editor/query/fileQueryEditorInput';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
+import { UNTITLED_QUERY_EDITOR_TYPEID } from 'sql/workbench/common/constants';
+import { IUntitledQueryEditorInput } from 'sql/workbench/common/editor/query/untitledQueryEditorInput';
+import { IEditorResolverService } from 'vs/workbench/services/editor/common/editorResolverService';
+import { Uri } from 'vscode';
+import { ILogService } from 'vs/platform/log/common/log';
+
+export class UntitledQueryEditorInput extends QueryEditorInput implements IUntitledQueryEditorInput {
+
+	public static readonly ID = UNTITLED_QUERY_EDITOR_TYPEID;
+
+	constructor(
+		description: string | undefined,
+		text: UntitledTextEditorInput,
+		results: QueryResultsInput,
+		@IConnectionManagementService connectionManagementService: IConnectionManagementService,
+		@IQueryModelService queryModelService: IQueryModelService,
+		@IConfigurationService configurationService: IConfigurationService,
+		@IInstantiationService instantiationService: IInstantiationService,
+		@ILogService private readonly logService: ILogService,
+		@IEditorResolverService private readonly editorResolverService: IEditorResolverService
+	) {
+		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.setLanguageId(text.getLanguageId() ?? 'sql');
+	}
+
+	public override resolve(): Promise<IUntitledTextEditorModel & IResolvedTextEditorModel> {
+		return this.text.resolve();
+	}
+
+	public override get text(): UntitledTextEditorInput {
+		return this._text as UntitledTextEditorInput;
+	}
+
+	public get hasAssociatedFilePath(): boolean {
+		return this.text.model.hasAssociatedFilePath;
+	}
+
+	override async save(group: GroupIdentifier, options?: ISaveOptions): Promise<IUntypedEditorInput | undefined> {
+		let fileEditorInput = await this.text.save(group, options);
+		return this.createFileQueryEditorInput(fileEditorInput, group);
+	}
+
+	override async saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IUntypedEditorInput | undefined> {
+		let fileEditorInput = await this.text.saveAs(group, options);
+		return this.createFileQueryEditorInput(fileEditorInput, group);
+	}
+
+	private async createFileQueryEditorInput(untypedEditor: IUntypedEditorInput, group: GroupIdentifier): Promise<IUntypedEditorInput> {
+		// Create our own FileQueryEditorInput wrapper here so that the existing state (connection, results, etc) can be transferred from this input to the new file input.
+		try {
+			let newUri: Uri = (<any>untypedEditor).resource;
+			let newUriString = newUri.toString(true);
+			await this.changeConnectionUri(newUriString);
+
+			// create a FileQueryEditorInput from the untyped editor input
+			this._results.uri = newUriString;
+			const editor = await this.editorResolverService.resolveEditor({ resource: (<any>untypedEditor).resource, options: { override: DEFAULT_EDITOR_ASSOCIATION.id } }, group);
+			if (isEditorInputWithOptionsAndGroup(editor)) {
+				let newInput = this.instantiationService.createInstance(FileQueryEditorInput, '', <FileEditorInput>(editor.editor), this.results);
+				newInput.state.setState(this.state);
+				return newInput;
+			} else {
+				throw new Error(`Could not resolved editor for resource '${newUriString}'`);
+			}
+		}
+		catch (error) {
+			/**
+			 * We are saving over a file that is already open and connected, return the unaltered save editor input directly (to avoid side effects when changing connection).
+			 * This will replace the editor input in the already open window with that of the new one,
+			 * the connection will be undefined and the file appears to be disconnected even if its not, change the connection to fix this.
+			 * also the results shown will be the old results, until run is clicked again.
+			 */
+			this.logService.warn(error.message);
+			return untypedEditor;
+		}
+	}
+
+	public setMode(mode: string): void {
+		this.text.setLanguageId(mode);
+	}
+
+	public getMode(): string | undefined {
+		return this.text.getLanguageId();
+	}
+
+	override get typeId(): string {
+		return UntitledQueryEditorInput.ID;
+	}
+
+	public getEncoding(): string | undefined {
+		return this.text.getEncoding();
+	}
+
+	public setEncoding(encoding: string, mode: EncodingMode): Promise<void> {
+		return this.text.setEncoding(encoding, mode);
+	}
+
+	override get capabilities(): EditorInputCapabilities {
+		// Subclasses need to explicitly opt-in to being untitled.
+		return EditorInputCapabilities.Untitled;
+	}
+}

src/sql/workbench/common/editor/query/untitledQueryEditorInput.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IConnectableInput } from 'sql/platform/connection/common/connectionManagement';
+import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
+import { EditorInputCapabilities } from 'vs/workbench/common/editor';
+import { EditorInput } from 'vs/workbench/common/editor/editorInput';
+import { EncodingMode } from 'vs/workbench/services/textfile/common/textfiles';
+import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
+import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
+
+export interface IUntitledQueryEditorInput extends EditorInput, IConnectableInput {
+
+	resolve(): Promise<IUntitledTextEditorModel & IResolvedTextEditorModel>;
+
+	text: UntitledTextEditorInput;
+
+	hasAssociatedFilePath: boolean;
+
+	setMode(mode: string): void
+
+	getMode(): string | undefined;
+
+	typeId: string;
+
+	getEncoding(): string | undefined;
+
+	setEncoding(encoding: string, mode: EncodingMode): Promise<void>
+
+	capabilities: EditorInputCapabilities
+}

src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts

@@ -31,7 +31,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
 import { isUndefinedOrNull } from 'vs/base/common/types';
 import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
-import { FileQueryEditorInput } from 'sql/workbench/contrib/query/browser/fileQueryEditorInput';
+import { FileQueryEditorInput } from 'sql/workbench/browser/editor/query/fileQueryEditorInput';
 import { TestDialogService } from 'vs/platform/dialogs/test/common/testDialogService';
 import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
 

src/sql/workbench/contrib/query/browser/query.contribution.ts

@@ -27,9 +27,9 @@ import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle
 import { TimeElapsedStatusBarContributions, RowCountStatusBarContributions, QueryStatusStatusBarContributions, QueryResultSelectionSummaryStatusBarContribution } from 'sql/workbench/contrib/query/browser/statusBarItems';
 import { SqlFlavorStatusbarItem, ChangeFlavorAction } from 'sql/workbench/contrib/query/browser/flavorStatus';
 import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/editor';
-import { FileQueryEditorInput } from 'sql/workbench/contrib/query/browser/fileQueryEditorInput';
+import { FileQueryEditorInput } from 'sql/workbench/browser/editor/query/fileQueryEditorInput';
 import { FileQueryEditorSerializer, QueryEditorLanguageAssociation, UntitledQueryEditorSerializer } from 'sql/workbench/contrib/query/browser/queryEditorFactory';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
 import { ILanguageAssociationRegistry, Extensions as LanguageAssociationExtensions } from 'sql/workbench/services/languageAssociation/common/languageAssociation';
 import { NewQueryTask, OE_NEW_QUERY_ACTION_ID, DE_NEW_QUERY_COMMAND_ID } from 'sql/workbench/contrib/query/browser/queryActions';
 import { TreeNodeContextKey } from 'sql/workbench/services/objectExplorer/common/treeNodeContextKey';

src/sql/workbench/contrib/query/browser/queryEditor.ts

@@ -38,7 +38,7 @@ import * as queryContext from 'sql/workbench/contrib/query/common/queryContext';
 import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar';
 import * as actions from 'sql/workbench/contrib/query/browser/queryActions';
 import { IRange } from 'vs/editor/common/core/range';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
 import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';

src/sql/workbench/contrib/query/browser/queryEditorFactory.ts

@@ -8,8 +8,8 @@ import { Registry } from 'vs/platform/registry/common/platform';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResultsInput';
 import { FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
-import { FileQueryEditorInput } from 'sql/workbench/contrib/query/browser/fileQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
+import { FileQueryEditorInput } from 'sql/workbench/browser/editor/query/fileQueryEditorInput';
 import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { ILanguageAssociation } from 'sql/workbench/services/languageAssociation/common/languageAssociation';

src/sql/workbench/contrib/query/test/browser/queryActions.test.ts

@@ -22,7 +22,7 @@ import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
 import { TestFileService, TestTextResourceConfigurationService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
 import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
 import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService';
 import { URI } from 'vs/base/common/uri';

src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts

@@ -20,7 +20,7 @@ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
 import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
 import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
 import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService';
 import { Event } from 'vs/base/common/event';
 import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';

src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts

@@ -18,7 +18,7 @@ import { TestConnectionManagementService } from 'sql/platform/connection/test/co
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConnectionManagementService, IConnectionCompletionOptions, IConnectionCallbacks, IConnectionResult } from 'sql/platform/connection/common/connectionManagement';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
 import { isThenable } from 'vs/base/common/async';

src/sql/workbench/services/queryEditor/browser/queryEditorService.ts

@@ -7,7 +7,7 @@ import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResult
 import { EditDataInput } from 'sql/workbench/browser/editData/editDataInput';
 import { ConnectionType, IConnectableInput, IConnectionCompletionOptions, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryEditorService, INewSqlEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
 
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';

src/sql/workbench/services/queryEditor/common/queryEditorService.ts

@@ -7,7 +7,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IConnectableInput } from 'sql/platform/connection/common/connectionManagement';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
 import { URI } from 'vs/base/common/uri';
-import { IUntitledQueryEditorInput } from 'sql/base/query/common/untitledQueryEditorInput';
+import { IUntitledQueryEditorInput } from 'sql/workbench/common/editor/query/untitledQueryEditorInput';
 
 export interface IQueryEditorOptions extends IEditorOptions {
 

src/sql/workbench/services/queryEditor/test/browser/testQueryEditorService.ts

@@ -6,11 +6,11 @@
 import { IQueryEditorService, INewSqlEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { IConnectableInput } from 'sql/platform/connection/common/connectionManagement';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { UntitledQueryEditorInput } from 'sql/base/query/browser/untitledQueryEditorInput';
+import { UntitledQueryEditorInput } from 'sql/workbench/browser/editor/query/untitledQueryEditorInput';
 import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
 import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResultsInput';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
-import { IUntitledQueryEditorInput } from 'sql/base/query/common/untitledQueryEditorInput';
+import { IUntitledQueryEditorInput } from 'sql/workbench/common/editor/query/untitledQueryEditorInput';
 
 export class TestQueryEditorService implements IQueryEditorService {
 	_serviceBrand: undefined;

src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts

@@ -20,7 +20,7 @@ import { ITestInstantiationService, TestEditorService } from 'vs/workbench/test/
 import { NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/browser/stubs';
 import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
 import { URI } from 'vs/base/common/uri';
-import { FileQueryEditorInput } from 'sql/workbench/contrib/query/browser/fileQueryEditorInput';
+import { FileQueryEditorInput } from 'sql/workbench/browser/editor/query/fileQueryEditorInput';
 import { QueryResultsInput } from 'sql/workbench/common/editor/query/queryResultsInput';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { EditorType } from 'vs/editor/common/editorCommon';