diff --git a/src/sql/workbench/contrib/query/browser/fileQueryEditorInput.ts b/src/sql/workbench/browser/editor/query/fileQueryEditorInput.ts similarity index 100% rename from src/sql/workbench/contrib/query/browser/fileQueryEditorInput.ts rename to src/sql/workbench/browser/editor/query/fileQueryEditorInput.ts diff --git a/src/sql/base/query/browser/untitledQueryEditorInput.ts b/src/sql/workbench/browser/editor/query/untitledQueryEditorInput.ts similarity index 96% rename from src/sql/base/query/browser/untitledQueryEditorInput.ts rename to src/sql/workbench/browser/editor/query/untitledQueryEditorInput.ts index 2f35a9936d..ad0bfa39c0 100644 --- a/src/sql/base/query/browser/untitledQueryEditorInput.ts +++ b/src/sql/workbench/browser/editor/query/untitledQueryEditorInput.ts @@ -14,11 +14,11 @@ import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/u 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/contrib/query/browser/fileQueryEditorInput'; +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/base/query/common/untitledQueryEditorInput'; +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'; diff --git a/src/sql/base/query/common/untitledQueryEditorInput.ts b/src/sql/workbench/common/editor/query/untitledQueryEditorInput.ts similarity index 100% rename from src/sql/base/query/common/untitledQueryEditorInput.ts rename to src/sql/workbench/common/editor/query/untitledQueryEditorInput.ts diff --git a/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts b/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts index 632f7f2963..413ba14c65 100644 --- a/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts +++ b/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'; diff --git a/src/sql/workbench/contrib/query/browser/query.contribution.ts b/src/sql/workbench/contrib/query/browser/query.contribution.ts index ab5ae8ecd0..f41ff0faf0 100644 --- a/src/sql/workbench/contrib/query/browser/query.contribution.ts +++ b/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'; diff --git a/src/sql/workbench/contrib/query/browser/queryEditor.ts b/src/sql/workbench/contrib/query/browser/queryEditor.ts index 19114bda6c..fa2f454012 100644 --- a/src/sql/workbench/contrib/query/browser/queryEditor.ts +++ b/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'; diff --git a/src/sql/workbench/contrib/query/browser/queryEditorFactory.ts b/src/sql/workbench/contrib/query/browser/queryEditorFactory.ts index 29603bfca6..5434647397 100644 --- a/src/sql/workbench/contrib/query/browser/queryEditorFactory.ts +++ b/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'; diff --git a/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts b/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts index 55557df8bc..1469ca0da2 100644 --- a/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts +++ b/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'; diff --git a/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts b/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts index 3e3ef58d13..1078b2e7ac 100644 --- a/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts +++ b/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'; diff --git a/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts b/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts index b777d641b5..a6e67a44ee 100644 --- a/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts +++ b/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'; diff --git a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts index f1ea01515a..cab4e1e6d3 100644 --- a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts +++ b/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'; diff --git a/src/sql/workbench/services/queryEditor/common/queryEditorService.ts b/src/sql/workbench/services/queryEditor/common/queryEditorService.ts index 064fcf6b46..bc606ab987 100644 --- a/src/sql/workbench/services/queryEditor/common/queryEditorService.ts +++ b/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 { diff --git a/src/sql/workbench/services/queryEditor/test/browser/testQueryEditorService.ts b/src/sql/workbench/services/queryEditor/test/browser/testQueryEditorService.ts index abbcb133da..c21e9f5e3d 100644 --- a/src/sql/workbench/services/queryEditor/test/browser/testQueryEditorService.ts +++ b/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; diff --git a/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts b/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts index 8f493784cc..a6a5a273b8 100644 --- a/src/sql/workbench/test/browser/parts/editor/editorStatusModeSelect.test.ts +++ b/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'; diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index a4be82ca60..7e483e64c5 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -40,7 +40,7 @@ import { IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/ import { Schemas } from 'vs/base/common/network'; import { Registry } from 'vs/platform/registry/common/platform'; import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService'; -import { FileQueryEditorInput } from 'sql/workbench/contrib/query/browser/fileQueryEditorInput'; // {{SQL CARBON EDIT}} - add type +import { FileQueryEditorInput } from 'sql/workbench/browser/editor/query/fileQueryEditorInput'; // {{SQL CARBON EDIT}} - add type type CachedEditorInput = TextResourceEditorInput | IFileEditorInput | UntitledTextEditorInput;