From cec7753e3d30cb11353bcf23ff18b3ff9bb6d3cc Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Wed, 19 Feb 2020 14:43:16 -0800 Subject: [PATCH] Final layering (#9164) * move handling generated files to the serilization classes * remove unneeded methods * add more folders to strictire compile, add more strict compile options * update ci * wip * add more layering and fix issues * add more strictness * remove unnecessary assertion * add missing checks * fix indentation * wip * remove jsdoc * fix layering * fix compile * fix compile errors * wip * wip * finish layering * fix css * more layering * rip * reworking results serializer * move some files around * move capabilities to platform wip * implement capabilities register provider * fix capabilities service * fix usage of the regist4ry * add contribution * wip * wip * wip * remove no longer good parts * fix strict-nulls * fix issues with startup * another try * fix startup * fix imports * fix tests * fix tests * fix more tests * fix tests * fix more tests * fix broken test * fix tabbing * fix naming * wip * finished layering * fix imports * fix valid layers * fix layers * wip * finish layering * final layering * finish layering * fix spacing --- .eslintrc.json | 169 +++++++++++++++++- .../mainThreadNotebookDocumentsAndEditors.ts | 4 +- .../editData/browser/editDataGridActions.ts | 4 +- .../editData/browser/editDataGridPanel.ts | 2 +- .../{common => browser}/gridActions.ts | 2 +- .../editData/browser/gridParentComponent.ts | 4 +- .../editorReplacerContribution.test.ts | 4 +- .../grid/{common => browser}/interfaces.ts | 1 + .../models/fileNotebookInput.ts | 0 .../models/nodebookInputFactory.ts | 4 +- .../models/untitledNotebookInput.ts | 0 .../notebook/browser/notebook.contribution.ts | 6 +- .../test/browser/notebookInput.test.ts | 4 +- .../notebookEditorModel.test.ts | 0 .../query/browser/query.contribution.ts | 4 +- .../{common => browser}/queryInputFactory.ts | 0 .../test/browser/queryInputFactory.test.ts | 2 +- .../abstractEnablePreviewFeatures.ts} | 0 .../browser/enablePreviewFeatures.ts | 2 +- .../electron-browser/enablePreviewFeatures.ts | 2 +- 20 files changed, 184 insertions(+), 30 deletions(-) rename src/sql/workbench/contrib/editData/{common => browser}/gridActions.ts (98%) rename src/sql/workbench/contrib/editorReplacement/test/{common => browser}/editorReplacerContribution.test.ts (99%) rename src/sql/workbench/contrib/grid/{common => browser}/interfaces.ts (99%) rename src/sql/workbench/contrib/notebook/{common => browser}/models/fileNotebookInput.ts (100%) rename src/sql/workbench/contrib/notebook/{common => browser}/models/nodebookInputFactory.ts (98%) rename src/sql/workbench/contrib/notebook/{common => browser}/models/untitledNotebookInput.ts (100%) rename src/sql/workbench/contrib/notebook/test/{browser => electron-browser}/notebookEditorModel.test.ts (100%) rename src/sql/workbench/contrib/query/{common => browser}/queryInputFactory.ts (100%) rename src/sql/workbench/contrib/welcome/gettingStarted/{common/enablePreviewFeatures.ts => browser/abstractEnablePreviewFeatures.ts} (100%) diff --git a/.eslintrc.json b/.eslintrc.json index 65822e432a..b3d8a70e6c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -55,7 +55,7 @@ "code-layering": [ "warn", { - "common": ["browser"], // {{SQL CARBON EDIT}} @anthonydresser not ideal, but for our purposes its fine for now, + "common": [], "node": [ "common" ], @@ -109,7 +109,7 @@ "target": "**/{vs,sql}/base/node/**", "restrictions": [ "vs/nls", - "**/{vs,sql}/base/{common,browser,node}/**", + "**/{vs,sql}/base/{common,node}/**", "!path" // node modules (except path where we have our own impl) ] }, @@ -118,6 +118,7 @@ "target": "**/{vs,sql}/base/test/browser/**", "restrictions": [ "assert", + "sinon", "vs/nls", "**/{vs,sql}/base/{common,browser}/**", "**/{vs,sql}/base/test/{common,browser}/**", @@ -148,8 +149,8 @@ "target": "**/{vs,sql}/base/parts/*/node/**", "restrictions": [ "vs/nls", - "**/{vs,sql}/base/{common,browser,node}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node}/**", + "**/{vs,sql}/base/{common,node}/**", + "**/{vs,sql}/base/parts/*/{common,node}/**", "!path" // node modules (except path where we have our own impl) ] }, @@ -169,8 +170,8 @@ "target": "**/{vs,sql}/base/parts/*/electron-main/**", "restrictions": [ "vs/nls", - "**/{vs,sql}/base/{common,browser,node,electron-main}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node,electron-main}/**", + "**/{vs,sql}/base/{common,node,electron-main}/**", + "**/{vs,sql}/base/parts/*/{common,node,electron-main}/**", "!path", // node modules (except path where we have our own impl) "@angular/*", "rxjs/*" @@ -419,7 +420,7 @@ ] }, { - "target": "**/vs/workbench/workbench.desktop.main.ts", + "target": "**/{vs,sql}/workbench/workbench.desktop.main.ts", "restrictions": [ "**" ] @@ -432,7 +433,7 @@ "vs/nls", "**/{vs,sql}/base/common/**", "**/{vs,sql}/platform/*/common/**", - "**/vs/editor/common/**", + "**/{vs,sql}/editor/common/**", "**/{vs,sql}/editor/contrib/*/common/**", "**/{vs,sql}/workbench/api/common/**", "**/{vs,sql}/workbench/common/**", @@ -528,6 +529,158 @@ "@angular/*", "rxjs/**" ] + }, + { + "target": "**/{vs,sql}/workbench/services/**/node/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/**/{common,node}/**", + "**/{vs,sql}/platform/**/{common,node}/**", + "**/{vs,sql}/editor/{common,node}/**", + "**/{vs,sql}/workbench/{common,node}/**", + "**/{vs,sql}/workbench/api/{common,node}/**", + "**/{vs,sql}/workbench/services/**/{common,node}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/workbench/services/**/electron-browser/**", + "restrictions": [ + "vs/nls", + "vs/css!./**/*", + "**/{vs,sql}/base/**/{common,browser,worker,node,electron-browser}/**", + "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**", + "**/{vs,sql}/editor/**", + "**/{vs,sql}/workbench/{common,browser,node,electron-browser,api}/**", + "**/{vs,sql}/workbench/services/**/{common,browser,node,electron-browser}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/workbench/contrib/terminal/browser/**", + "restrictions": [ + // xterm and its addons are strictly browser-only components + "xterm", + "xterm-addon-*", + "**/{vs,sql}/**" + ] + }, + { + "target": "**/{vs,sql}/workbench/contrib/extensions/browser/**", + "restrictions": [ + "semver-umd", + "**/{vs,sql}/**" + ] + }, + { + "target": "**/{vs,sql}/workbench/contrib/update/browser/update.ts", + "restrictions": [ + "semver-umd", + "**/{vs,sql}/**" + ] + }, + { + "target": "**/{vs,sql}/code/node/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/**/{common,node}/**", + "**/{vs,sql}/base/parts/**/{common,node}/**", + "**/{vs,sql}/platform/**/{common,node}/**", + "**/{vs,sql}/code/**/{common,node}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/code/electron-browser/**", + "restrictions": [ + "vs/nls", + "vs/css!./**/*", + "**/{vs,sql}/base/**/{common,browser,node,electron-browser}/**", + "**/{vs,sql}/base/parts/**/{common,browser,node,electron-browser}/**", + "**/{vs,sql}/platform/**/{common,browser,node,electron-browser}/**", + "**/{vs,sql}/code/**/{common,browser,node,electron-browser}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/code/electron-main/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/**/{common,node,electron-main}/**", + "**/{vs,sql}/base/parts/**/{common,node,electron-main}/**", + "**/{vs,sql}/platform/**/{common,node,electron-main}/**", + "**/{vs,sql}/code/**/{common,node,electron-main}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/server/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/**/{common,node}/**", + "**/{vs,sql}/base/parts/**/{common,node}/**", + "**/{vs,sql}/platform/**/{common,node}/**", + "**/{vs,sql}/workbench/**/{common,node}/**", + "**/{vs,sql}/server/**", + "**/{vs,sql}/code/**/{common,node}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{node,electron-browser,electron-main}/**", + "restrictions": "**/*" + }, + { + "target": "**/extensions/**", + "restrictions": "**/*" + }, + { + "target": "**/test/smoke/**", + "restrictions": [ + "**/test/smoke/**", + "*" + ] + }, + { + "target": "**/test/automation/**", + "restrictions": [ + "**/test/automation/**", + "*" + ] + }, + { + "target": "**/test/integration/**", + "restrictions": [ + "**/test/integration/**", + "*" + ] + }, + { + "target": "{**/api/**.test.ts,}", + "restrictions": "{**/{vs,sql}/**,assert,sinon,crypto,vscode,typemoq,azdata}" + }, + { + "target": "{**/**.test.ts,**/test/**}", + "restrictions": "{**/{vs,sql}/**,assert,sinon,crypto,xterm*,vscode,typemoq,azdata}" + }, + { + "target": "**/browser/**", + "restrictions": [ + "**/{vs,sql}/**", + "azdata", + "vscode", + "@angular/*", + "rxjs/**", + "chart.js", + "ng2-charts", + "angular2-grid", + "html-query-plan", + "plotly.js-dist" + ] + }, + { + "target": "**/{common,browser,workbench}/**", + "restrictions": ["**/{vs,sql}/**","azdata","vscode"] } ] }, diff --git a/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts index 9cafdc873e..d40bbaeb54 100644 --- a/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts @@ -31,8 +31,8 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor'; import { localize } from 'vs/nls'; import { IFileService } from 'vs/platform/files/common/files'; -import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/common/models/untitledNotebookInput'; -import { FileNotebookInput } from 'sql/workbench/contrib/notebook/common/models/fileNotebookInput'; +import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/untitledNotebookInput'; +import { FileNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/fileNotebookInput'; import { find } from 'vs/base/common/arrays'; import { IUntitledTextEditorService } from 'vs/workbench/services/untitled/common/untitledTextEditorService'; import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput'; diff --git a/src/sql/workbench/contrib/editData/browser/editDataGridActions.ts b/src/sql/workbench/contrib/editData/browser/editDataGridActions.ts index 565012bfd3..d6980d9c47 100644 --- a/src/sql/workbench/contrib/editData/browser/editDataGridActions.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataGridActions.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IGridInfo } from 'sql/workbench/contrib/grid/common/interfaces'; +import { IGridInfo } from 'sql/workbench/contrib/grid/browser/interfaces'; import { DataService } from 'sql/workbench/services/query/common/dataService'; -import { GridActionProvider } from 'sql/workbench/contrib/editData/common/gridActions'; +import { GridActionProvider } from 'sql/workbench/contrib/editData/browser/gridActions'; import { localize } from 'vs/nls'; import { IAction, Action } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/contrib/editData/browser/editDataGridPanel.ts b/src/sql/workbench/contrib/editData/browser/editDataGridPanel.ts index 64aa48367e..1f6507a242 100644 --- a/src/sql/workbench/contrib/editData/browser/editDataGridPanel.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataGridPanel.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/editData'; import { VirtualizedCollection, AsyncDataProvider, ISlickColumn } from 'sql/base/browser/ui/table/asyncDataView'; import { Table } from 'sql/base/browser/ui/table/table'; -import { IGridDataSet } from 'sql/workbench/contrib/grid/common/interfaces'; +import { IGridDataSet } from 'sql/workbench/contrib/grid/browser/interfaces'; import * as Services from 'sql/base/browser/ui/table/formatters'; import { GridParentComponent } from 'sql/workbench/contrib/editData/browser/gridParentComponent'; import { EditDataGridActionProvider } from 'sql/workbench/contrib/editData/browser/editDataGridActions'; diff --git a/src/sql/workbench/contrib/editData/common/gridActions.ts b/src/sql/workbench/contrib/editData/browser/gridActions.ts similarity index 98% rename from src/sql/workbench/contrib/editData/common/gridActions.ts rename to src/sql/workbench/contrib/editData/browser/gridActions.ts index 36565dbe02..d418e8eb1f 100644 --- a/src/sql/workbench/contrib/editData/common/gridActions.ts +++ b/src/sql/workbench/contrib/editData/browser/gridActions.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IGridInfo } from 'sql/workbench/contrib/grid/common/interfaces'; +import { IGridInfo } from 'sql/workbench/contrib/grid/browser/interfaces'; import { DataService } from 'sql/workbench/services/query/common/dataService'; import { localize } from 'vs/nls'; diff --git a/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts b/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts index 29162ff477..8dd95f786e 100644 --- a/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts +++ b/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts @@ -9,10 +9,10 @@ import 'vs/css!./media/styles'; import { Table } from 'sql/base/browser/ui/table/table'; import { Subscription, Subject } from 'rxjs/Rx'; import * as Constants from 'sql/platform/query/common/constants'; -import { IGridInfo, IGridDataSet } from 'sql/workbench/contrib/grid/common/interfaces'; +import { IGridInfo, IGridDataSet } from 'sql/workbench/contrib/grid/browser/interfaces'; import * as Utils from 'sql/platform/connection/common/utils'; import { DataService } from 'sql/workbench/services/query/common/dataService'; -import * as actions from 'sql/workbench/contrib/editData/common/gridActions'; +import * as actions from 'sql/workbench/contrib/editData/browser/gridActions'; import * as GridContentEvents from 'sql/workbench/services/query/common/gridContentEvents'; import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/workbench/contrib/query/common/queryContext'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; diff --git a/src/sql/workbench/contrib/editorReplacement/test/common/editorReplacerContribution.test.ts b/src/sql/workbench/contrib/editorReplacement/test/browser/editorReplacerContribution.test.ts similarity index 99% rename from src/sql/workbench/contrib/editorReplacement/test/common/editorReplacerContribution.test.ts rename to src/sql/workbench/contrib/editorReplacement/test/browser/editorReplacerContribution.test.ts index d4376e90c8..ed509652d6 100644 --- a/src/sql/workbench/contrib/editorReplacement/test/common/editorReplacerContribution.test.ts +++ b/src/sql/workbench/contrib/editorReplacement/test/browser/editorReplacerContribution.test.ts @@ -20,9 +20,9 @@ import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileE import { QueryEditorInput } from 'sql/workbench/common/editor/query/queryEditorInput'; import { Registry } from 'vs/platform/registry/common/platform'; import { ILanguageAssociationRegistry, Extensions as LanguageAssociationExtensions } from 'sql/workbench/services/languageAssociation/common/languageAssociation'; -import { QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/common/queryInputFactory'; +import { QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/browser/queryInputFactory'; import { workbenchInstantiationService } from 'sql/workbench/test/workbenchTestServices'; -import { NotebookEditorInputAssociation } from 'sql/workbench/contrib/notebook/common/models/nodebookInputFactory'; +import { NotebookEditorInputAssociation } from 'sql/workbench/contrib/notebook/browser/models/nodebookInputFactory'; import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput'; import { UntitledQueryEditorInput } from 'sql/workbench/common/editor/query/untitledQueryEditorInput'; diff --git a/src/sql/workbench/contrib/grid/common/interfaces.ts b/src/sql/workbench/contrib/grid/browser/interfaces.ts similarity index 99% rename from src/sql/workbench/contrib/grid/common/interfaces.ts rename to src/sql/workbench/contrib/grid/browser/interfaces.ts index e8abb2a4c5..ea2acd0abf 100644 --- a/src/sql/workbench/contrib/grid/common/interfaces.ts +++ b/src/sql/workbench/contrib/grid/browser/interfaces.ts @@ -4,6 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { VirtualizedCollection, ISlickColumn } from 'sql/base/browser/ui/table/asyncDataView'; + export interface IGridDataSet { dataRows: VirtualizedCollection<{}>; columnDefinitions: ISlickColumn[]; diff --git a/src/sql/workbench/contrib/notebook/common/models/fileNotebookInput.ts b/src/sql/workbench/contrib/notebook/browser/models/fileNotebookInput.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/common/models/fileNotebookInput.ts rename to src/sql/workbench/contrib/notebook/browser/models/fileNotebookInput.ts diff --git a/src/sql/workbench/contrib/notebook/common/models/nodebookInputFactory.ts b/src/sql/workbench/contrib/notebook/browser/models/nodebookInputFactory.ts similarity index 98% rename from src/sql/workbench/contrib/notebook/common/models/nodebookInputFactory.ts rename to src/sql/workbench/contrib/notebook/browser/models/nodebookInputFactory.ts index d6abd1ec74..de4f24d1ed 100644 --- a/src/sql/workbench/contrib/notebook/common/models/nodebookInputFactory.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/nodebookInputFactory.ts @@ -7,8 +7,8 @@ import { IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorI import { Registry } from 'vs/platform/registry/common/platform'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files'; -import { FileNotebookInput } from 'sql/workbench/contrib/notebook/common/models/fileNotebookInput'; -import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/common/models/untitledNotebookInput'; +import { FileNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/fileNotebookInput'; +import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/untitledNotebookInput'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/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/notebook/common/models/untitledNotebookInput.ts b/src/sql/workbench/contrib/notebook/browser/models/untitledNotebookInput.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/common/models/untitledNotebookInput.ts rename to src/sql/workbench/contrib/notebook/browser/models/untitledNotebookInput.ts diff --git a/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts index 7ad062751b..35bcda5580 100644 --- a/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -10,9 +10,9 @@ import { localize } from 'vs/nls'; import { IEditorInputFactoryRegistry, Extensions as EditorInputFactoryExtensions } from 'vs/workbench/common/editor'; import { ILanguageAssociationRegistry, Extensions as LanguageAssociationExtensions } from 'sql/workbench/services/languageAssociation/common/languageAssociation'; -import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/common/models/untitledNotebookInput'; -import { FileNotebookInput } from 'sql/workbench/contrib/notebook/common/models/fileNotebookInput'; -import { FileNoteBookEditorInputFactory, UntitledNoteBookEditorInputFactory, NotebookEditorInputAssociation } from 'sql/workbench/contrib/notebook/common/models/nodebookInputFactory'; +import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/untitledNotebookInput'; +import { FileNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/fileNotebookInput'; +import { FileNoteBookEditorInputFactory, UntitledNoteBookEditorInputFactory, NotebookEditorInputAssociation } from 'sql/workbench/contrib/notebook/browser/models/nodebookInputFactory'; import { IWorkbenchActionRegistry, Extensions as WorkbenchActionsExtensions } from 'vs/workbench/common/actions'; import { SyncActionDescriptor, registerAction2, MenuRegistry, MenuId, Action2 } from 'vs/platform/actions/common/actions'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts index 65d4a9d370..78d6094278 100644 --- a/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookInput.test.ts @@ -9,8 +9,8 @@ import { nb } from 'azdata'; import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices'; import { Schemas } from 'vs/base/common/network'; import { URI } from 'vs/base/common/uri'; -import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/common/models/untitledNotebookInput'; -import { FileNotebookInput } from 'sql/workbench/contrib/notebook/common/models/fileNotebookInput'; +import { UntitledNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/untitledNotebookInput'; +import { FileNotebookInput } from 'sql/workbench/contrib/notebook/browser/models/fileNotebookInput'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel'; import { NodeStub, NotebookServiceStub } from 'sql/workbench/contrib/notebook/test/stubs'; diff --git a/src/sql/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookEditorModel.test.ts similarity index 100% rename from src/sql/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts rename to src/sql/workbench/contrib/notebook/test/electron-browser/notebookEditorModel.test.ts diff --git a/src/sql/workbench/contrib/query/browser/query.contribution.ts b/src/sql/workbench/contrib/query/browser/query.contribution.ts index f44187fca3..dfa729a034 100644 --- a/src/sql/workbench/contrib/query/browser/query.contribution.ts +++ b/src/sql/workbench/contrib/query/browser/query.contribution.ts @@ -23,7 +23,7 @@ import { RunQueryKeyboardAction, RunCurrentQueryKeyboardAction, CancelQueryKeyboardAction, RefreshIntellisenseKeyboardAction, ToggleQueryResultsKeyboardAction, RunQueryShortcutAction, RunCurrentQueryWithActualPlanKeyboardAction, FocusOnCurrentQueryKeyboardAction, ParseSyntaxAction } from 'sql/workbench/contrib/query/browser/keyboardQueryActions'; -import * as gridActions from 'sql/workbench/contrib/editData/common/gridActions'; +import * as gridActions from 'sql/workbench/contrib/editData/browser/gridActions'; import * as gridCommands from 'sql/workbench/contrib/editData/browser/gridCommands'; import * as Constants from 'sql/platform/query/common/constants'; import { localize } from 'vs/nls'; @@ -34,7 +34,7 @@ import { TimeElapsedStatusBarContributions, RowCountStatusBarContributions, Quer import { SqlFlavorStatusbarItem, ChangeFlavorAction } from 'sql/workbench/contrib/query/browser/flavorStatus'; import { IEditorInputFactoryRegistry, Extensions as EditorInputFactoryExtensions } from 'vs/workbench/common/editor'; import { FileQueryEditorInput } from 'sql/workbench/contrib/query/common/fileQueryEditorInput'; -import { FileQueryEditorInputFactory, UntitledQueryEditorInputFactory, QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/common/queryInputFactory'; +import { FileQueryEditorInputFactory, UntitledQueryEditorInputFactory, QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/browser/queryInputFactory'; import { UntitledQueryEditorInput } from 'sql/workbench/common/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'; diff --git a/src/sql/workbench/contrib/query/common/queryInputFactory.ts b/src/sql/workbench/contrib/query/browser/queryInputFactory.ts similarity index 100% rename from src/sql/workbench/contrib/query/common/queryInputFactory.ts rename to src/sql/workbench/contrib/query/browser/queryInputFactory.ts 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 a49cc5a4c6..5ea402a874 100644 --- a/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts +++ b/src/sql/workbench/contrib/query/test/browser/queryInputFactory.test.ts @@ -10,7 +10,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { IEditorInput } from 'vs/workbench/common/editor'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput'; import { workbenchInstantiationService } from 'sql/workbench/test/workbenchTestServices'; -import { QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/common/queryInputFactory'; +import { QueryEditorLanguageAssociation } from 'sql/workbench/contrib/query/browser/queryInputFactory'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { TestObjectExplorerService } from 'sql/workbench/services/objectExplorer/test/browser/testObjectExplorerService'; diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/common/enablePreviewFeatures.ts b/src/sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures.ts similarity index 100% rename from src/sql/workbench/contrib/welcome/gettingStarted/common/enablePreviewFeatures.ts rename to src/sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures.ts diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures.ts b/src/sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures.ts index af1675638a..2ce21fe847 100644 --- a/src/sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures.ts +++ b/src/sql/workbench/contrib/welcome/gettingStarted/browser/enablePreviewFeatures.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/common/enablePreviewFeatures'; +import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IHostService } from 'vs/workbench/services/host/browser/host'; diff --git a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures.ts b/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures.ts index f77cb87319..be1424fe48 100644 --- a/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures.ts +++ b/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/enablePreviewFeatures.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/common/enablePreviewFeatures'; +import { AbstractEnablePreviewFeatures } from 'sql/workbench/contrib/welcome/gettingStarted/browser/abstractEnablePreviewFeatures'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IHostService } from 'vs/workbench/services/host/browser/host';