diff --git a/extensions/mssql/src/main.ts b/extensions/mssql/src/main.ts index 2986b6b2a8..5f5e558837 100644 --- a/extensions/mssql/src/main.ts +++ b/extensions/mssql/src/main.ts @@ -190,8 +190,8 @@ async function handleNewNotebookTask(oeContext?: sqlops.ObjectExplorerContext, p // Get the file path after '/HDFS' let hdfsPath: string = oeContext.nodeInfo.nodePath.substring(oeContext.nodeInfo.nodePath.indexOf('/HDFS') + '/HDFS'.length); if (hdfsPath.length > 0) { - let analyzeCommand = "#" + msgSampleCodeDataFrame + os.EOL + "df = (spark.read.option(\"inferSchema\", \"true\")" - + os.EOL + ".option(\"header\", \"true\")" + os.EOL + ".csv('{0}'))" + os.EOL + "df.show(10)"; + let analyzeCommand = '#' + msgSampleCodeDataFrame + os.EOL + 'df = (spark.read.option("inferSchema", "true")' + + os.EOL + '.option("header", "true")' + os.EOL + '.csv("{0}"))' + os.EOL + 'df.show(10)'; editor.edit(editBuilder => { editBuilder.replace(0, { cell_type: 'code', diff --git a/extensions/notebook/src/extension.ts b/extensions/notebook/src/extension.ts index 37cf5265c0..34d8dbb3e1 100644 --- a/extensions/notebook/src/extension.ts +++ b/extensions/notebook/src/extension.ts @@ -125,8 +125,8 @@ async function analyzeNotebook(oeContext?: sqlops.ObjectExplorerContext): Promis // Get the file path after '/HDFS' let hdfsPath: string = oeContext.nodeInfo.nodePath.substring(oeContext.nodeInfo.nodePath.indexOf('/HDFS') + '/HDFS'.length); if (hdfsPath.length > 0) { - let analyzeCommand = "#" + msgSampleCodeDataFrame + os.EOL + "df = (spark.read.option(\"inferSchema\", \"true\")" - + os.EOL + ".option(\"header\", \"true\")" + os.EOL + ".csv('{0}'))" + os.EOL + "df.show(10)"; + let analyzeCommand = '#' + msgSampleCodeDataFrame + os.EOL + 'df = (spark.read.option("inferSchema", "true")' + + os.EOL + '.option("header", "true")' + os.EOL + '.csv("{0}"))' + os.EOL + 'df.show(10)'; editor.edit(editBuilder => { editBuilder.replace(0, { diff --git a/src/sql/base/browser/ui/dropdownList/dropdownList.ts b/src/sql/base/browser/ui/dropdownList/dropdownList.ts index 92938bea70..39a31394cf 100644 --- a/src/sql/base/browser/ui/dropdownList/dropdownList.ts +++ b/src/sql/base/browser/ui/dropdownList/dropdownList.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import 'vs/css!sql/base/browser/ui/dropdownList/media/dropdownList'; +import 'vs/css!./media/dropdownList'; import * as DOM from 'vs/base/browser/dom'; import { Dropdown, IDropdownOptions } from 'vs/base/browser/ui/dropdown/dropdown'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @@ -18,7 +18,7 @@ import { KeyCode } from 'vs/base/common/keyCodes'; import { Builder } from 'vs/base/browser/builder'; import { Button } from 'sql/base/browser/ui/button/button'; -import { attachButtonStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; export interface IDropdownStyles { backgroundColor?: Color; diff --git a/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts b/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts index 2dd8995d60..e9554e3359 100644 --- a/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts +++ b/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts @@ -14,7 +14,7 @@ import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { attachEditableDropdownStyler } from 'sql/common/theme/styler'; +import { attachEditableDropdownStyler } from 'sql/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @Component({ diff --git a/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts b/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts index a24cbaddab..2a2a429756 100644 --- a/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts +++ b/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts @@ -1,11 +1,9 @@ // Adopted and converted to typescript from https://github.com/danny-sg/slickgrid-spreadsheet-plugins/blob/master/ext.headerfilter.js // heavily modified -import 'vs/css!sql/base/browser/ui/table/media/table'; import { mixin } from 'vs/base/common/objects'; -import { SlickGrid } from 'angular2-slickgrid'; import { Button } from '../../button/button'; -import { attachButtonStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { escape } from 'sql/base/common/strings'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @@ -36,11 +34,11 @@ export class HeaderFilter { public init(grid: Slick.Grid): void { this.grid = grid; - this.handler.subscribe(this.grid.onHeaderCellRendered, (e, args) => this.handleHeaderCellRendered(e , args)) - .subscribe(this.grid.onBeforeHeaderCellDestroy, (e, args) => this.handleBeforeHeaderCellDestroy(e, args)) - .subscribe(this.grid.onClick, (e) => this.handleBodyMouseDown) - .subscribe(this.grid.onColumnsResized, () => this.columnsResized()) - .subscribe(this.grid.onKeyDown, (e) => this.handleKeyDown); + this.handler.subscribe(this.grid.onHeaderCellRendered, (e, args) => this.handleHeaderCellRendered(e, args)) + .subscribe(this.grid.onBeforeHeaderCellDestroy, (e, args) => this.handleBeforeHeaderCellDestroy(e, args)) + .subscribe(this.grid.onClick, (e) => this.handleBodyMouseDown) + .subscribe(this.grid.onColumnsResized, () => this.columnsResized()) + .subscribe(this.grid.onKeyDown, (e) => this.handleKeyDown); this.grid.setColumns(this.grid.getColumns()); $(document.body).bind('mousedown', this.handleBodyMouseDown); @@ -96,13 +94,13 @@ export class HeaderFilter { private addMenuItem(menu, columnDef, title, command, image) { let $item = $('
') - .data('command', command) - .data('column', columnDef) - .bind('click', (e) => this.handleMenuItemClick(e, command, columnDef)) - .appendTo(menu); + .data('command', command) + .data('column', columnDef) + .bind('click', (e) => this.handleMenuItemClick(e, command, columnDef)) + .appendTo(menu); let $icon = $('
') - .appendTo($item); + .appendTo($item); if (title === 'Sort Ascending') { $icon.get(0).className += ' ascending'; @@ -137,8 +135,8 @@ export class HeaderFilter { let filtered = _.contains(this.workingFilters, filterItems[i]); filterOptions += ''; + + (filtered ? ' checked="checked"' : '') + + '/>' + filterItems[i] + ''; } let $filter = menu.find('.filter'); $filter.empty().append($(filterOptions)); @@ -184,13 +182,13 @@ export class HeaderFilter { let filtered = _.contains(this.workingFilters, filterItems[i]); if (filterItems[i] && filterItems[i].indexOf('Error:') < 0) { filterOptions += ''; + + (filtered ? ' checked="checked"' : '') + + '/>' + escape(filterItems[i]) + ''; } } let $filter = $('
') - .append($(filterOptions)) - .appendTo(this.$menu); + .append($(filterOptions)) + .appendTo(this.$menu); this.okButton = new Button(this.$menu.get(0)); this.okButton.label = 'OK'; @@ -237,7 +235,7 @@ export class HeaderFilter { menutop -= (this.$menu.height() + $(e.target).height() + 8); } this.$menu.css('top', menutop) - .css('left', (left > 0 ? left : 0)); + .css('left', (left > 0 ? left : 0)); } private columnsResized() { @@ -262,7 +260,7 @@ export class HeaderFilter { if ($checkbox.prop('checked') && index < 0) { workingFilters.push(filterItems[value]); - let nextRow = filterItems[(parseInt(value)+1).toString()]; + let nextRow = filterItems[(parseInt(value) + 1).toString()]; if (nextRow && nextRow.indexOf('Error:') >= 0) { workingFilters.push(nextRow); } @@ -299,7 +297,7 @@ export class HeaderFilter { private getFilterValues(dataView, column) { let seen = []; - for (let i = 0; i < dataView.getLength() ; i++) { + for (let i = 0; i < dataView.getLength(); i++) { let value = dataView.getItem(i)[column.field]; if (!_.contains(seen, value)) { @@ -315,7 +313,7 @@ export class HeaderFilter { dataView = this.grid.getData(), seen = []; - for (let i = 0; i < dataView.getLength() ; i++) { + for (let i = 0; i < dataView.getLength(); i++) { let value = dataView.getItem(i)[column.field]; if (filter.length > 0) { diff --git a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts index b790fa76e4..57c41ed72f 100644 --- a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts +++ b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts @@ -28,8 +28,8 @@ import { values } from 'vs/base/common/map'; import * as sqlops from 'sqlops'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; -import { attachModalDialogStyler, attachButtonStyler, attachPanelStyler } from 'sql/common/theme/styler'; +import { Modal } from 'sql/workbench/browser/modal/modal'; +import { attachModalDialogStyler, attachButtonStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; import { AccountViewModel } from 'sql/parts/accountManagement/accountDialog/accountViewModel'; import { AddAccountAction } from 'sql/parts/accountManagement/common/accountActions'; import { AccountListRenderer, AccountListDelegate } from 'sql/parts/accountManagement/common/accountListRenderer'; diff --git a/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts b/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts index 8caf290a1f..b3838aa917 100644 --- a/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts +++ b/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog.ts @@ -16,9 +16,9 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler'; +import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; diff --git a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts index 80938a713e..59ab116622 100644 --- a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts +++ b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts @@ -24,9 +24,9 @@ import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import * as sqlops from 'sqlops'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import { FirewallRuleViewModel } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler'; +import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; diff --git a/src/sql/parts/admin/security/createLoginEditor.ts b/src/sql/parts/admin/security/createLoginEditor.ts index c7a7cdc58b..bcf0c325ef 100644 --- a/src/sql/parts/admin/security/createLoginEditor.ts +++ b/src/sql/parts/admin/security/createLoginEditor.ts @@ -16,7 +16,7 @@ import { CreateLoginModule } from 'sql/parts/admin/security/createLogin.module'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { bootstrapAngular, IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { CREATELOGIN_SELECTOR } from 'sql/parts/admin/security/createLogin.component'; import { CancellationToken } from 'vs/base/common/cancellation'; diff --git a/src/sql/parts/common/customInputConverter.ts b/src/sql/parts/common/customInputConverter.ts index aeb3393240..5edd2f853a 100644 --- a/src/sql/parts/common/customInputConverter.ts +++ b/src/sql/parts/common/customInputConverter.ts @@ -11,7 +11,7 @@ import URI from 'vs/base/common/uri'; import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { IQueryEditorOptions } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; import { NotebookInput, NotebookInputModel } from 'sql/parts/notebook/notebookInput'; import { DEFAULT_NOTEBOOK_PROVIDER, INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; diff --git a/src/sql/parts/connection/common/connectionActions.ts b/src/sql/parts/connection/common/connectionActions.ts index 73871c324d..9161040622 100644 --- a/src/sql/parts/connection/common/connectionActions.ts +++ b/src/sql/parts/connection/common/connectionActions.ts @@ -14,11 +14,11 @@ import { INotificationService, INotificationActions } from 'vs/platform/notifica import Severity from 'vs/base/common/severity'; import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IObjectExplorerService } from '../../objectExplorer/common/objectExplorerService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; /** * Workbench action to clear the recent connnections list diff --git a/src/sql/parts/connection/common/connectionStatus.ts b/src/sql/parts/connection/common/connectionStatus.ts index dbe8b80bcf..0991847c19 100644 --- a/src/sql/parts/connection/common/connectionStatus.ts +++ b/src/sql/parts/connection/common/connectionStatus.ts @@ -10,7 +10,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorG import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor'; diff --git a/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts b/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts index 95cd796886..f414fad1d3 100644 --- a/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts +++ b/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts @@ -6,7 +6,7 @@ 'use strict'; // // import { AdvancedPropertiesDialog } from 'sql/parts/connection/connectionDialog/advancedPropertiesDialog'; -import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog'; +import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as sqlops from 'sqlops'; import { localize } from 'vs/nls'; diff --git a/src/sql/parts/dashboard/common/actions.ts b/src/sql/parts/dashboard/common/actions.ts index be03506835..137dd1aec3 100644 --- a/src/sql/parts/dashboard/common/actions.ts +++ b/src/sql/parts/dashboard/common/actions.ts @@ -10,7 +10,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IDisposable } from 'vs/base/common/lifecycle'; import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/common/angularEventingService'; -import { INewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/interface'; +import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/common/newDashboardTabDialog'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts index 078a66d46a..80b15e5523 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts +++ b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts @@ -15,7 +15,7 @@ import { import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as Constants from 'sql/platform/connection/common/constants'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/parts/dashboard/widgets/insights/actions.ts b/src/sql/parts/dashboard/widgets/insights/actions.ts index 126c014bc9..4bca439475 100644 --- a/src/sql/parts/dashboard/widgets/insights/actions.ts +++ b/src/sql/parts/dashboard/widgets/insights/actions.ts @@ -8,9 +8,9 @@ import { TPromise } from 'vs/base/common/winjs.base'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { RunQueryOnConnectionMode, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { InsightActionContext } from 'sql/workbench/common/actions'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; export class RunInsightQueryAction extends Action { diff --git a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts b/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts index 81b19c1c6b..13e71a87f5 100644 --- a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts @@ -15,7 +15,7 @@ import { InsightAction, InsightActionContext } from 'sql/workbench/common/action import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { IInsightsConfig, IInsightsView } from './interfaces'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; -import { insertValueRegex } from 'sql/parts/insights/common/interfaces'; +import { insertValueRegex } from 'sql/workbench/services/insights/common/insightsDialogService'; import { RunInsightQueryAction } from './actions'; import { SimpleExecuteResult } from 'sqlops'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts b/src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts index 21ebd1f982..b0f4e411df 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts +++ b/src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts @@ -11,7 +11,7 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work import { IInsightsView, IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; @Component({ diff --git a/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts b/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts index c0f7527c5f..842dbd23f7 100644 --- a/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts +++ b/src/sql/parts/dataExplorer/objectExplorer/connectionViewlet/connectionViewletPanel.ts @@ -21,11 +21,11 @@ import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/v import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { Builder } from 'vs/base/browser/builder'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; +import { IAction } from 'vs/base/common/actions'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { ClearSearchAction, ActiveConnectionsFilterAction, AddServerAction, AddServerGroupAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; -import { IAction } from 'vs/base/common/actions'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; export class ConnectionViewletPanel extends ViewletPanel { diff --git a/src/sql/parts/disasterRecovery/backup/backup.component.ts b/src/sql/parts/disasterRecovery/backup/backup.component.ts index 220d45e0fd..a2639b2eed 100644 --- a/src/sql/parts/disasterRecovery/backup/backup.component.ts +++ b/src/sql/parts/disasterRecovery/backup/backup.component.ts @@ -10,17 +10,18 @@ import { Button } from 'sql/base/browser/ui/button/button'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { ListBox } from 'sql/base/browser/ui/listBox/listBox'; -import { ModalFooterStyle } from 'sql/base/browser/ui/modal/modal'; -import { CategoryView } from 'sql/base/browser/ui/modal/optionsDialog'; +import { ModalFooterStyle } from 'sql/workbench/browser/modal/modal'; +import { CategoryView } from 'sql/workbench/browser/modal/optionsDialog'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; -import { attachButtonStyler, attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler, attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as BackupConstants from 'sql/parts/disasterRecovery/backup/constants'; -import { IBackupService, IBackupUiService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; -import FileValidationConstants = require('sql/parts/fileBrowser/common/fileValidationServiceConstants'); -import { IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; +import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; +import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ScrollableSplitView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; +import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController'; +import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; import * as lifecycle from 'vs/base/common/lifecycle'; diff --git a/src/sql/parts/disasterRecovery/backup/backupDialog.ts b/src/sql/parts/disasterRecovery/backup/backupDialog.ts index 01e1445fea..e165806bc8 100644 --- a/src/sql/parts/disasterRecovery/backup/backupDialog.ts +++ b/src/sql/parts/disasterRecovery/backup/backupDialog.ts @@ -3,11 +3,11 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { BackupModule } from 'sql/parts/disasterRecovery/backup/backup.module'; import { BACKUP_SELECTOR } from 'sql/parts/disasterRecovery/backup/backup.component'; -import { attachModalDialogStyler } from 'sql/common/theme/styler'; +import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; diff --git a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts b/src/sql/parts/disasterRecovery/restore/restoreDialog.ts index ae315ae9ef..5a554048ea 100644 --- a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts +++ b/src/sql/parts/disasterRecovery/restore/restoreDialog.ts @@ -18,7 +18,6 @@ import { IPartService } from 'vs/workbench/services/part/common/partService'; import { localize } from 'vs/nls'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { mixin } from 'vs/base/common/objects'; -import * as DOM from 'vs/base/browser/dom'; import * as strings from 'vs/base/common/strings'; import * as sqlops from 'sqlops'; @@ -31,18 +30,18 @@ import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectio import { CheckboxSelectColumn } from 'sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; -import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler } from 'sql/common/theme/styler'; +import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; +import { Modal } from 'sql/workbench/browser/modal/modal'; +import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as BackupConstants from 'sql/parts/disasterRecovery/backup/constants'; import { RestoreViewModel, RestoreOptionParam, SouceDatabaseNamesParam } from 'sql/parts/disasterRecovery/restore/restoreViewModel'; -import * as FileValidationConstants from 'sql/parts/fileBrowser/common/fileValidationServiceConstants'; +import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants'; import { Dropdown } from 'sql/base/browser/ui/editableDropdown/dropdown'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; +import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController'; interface FileListElement { logicalFileName: string; diff --git a/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts b/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts index a98d195f5b..3c20cf24a5 100644 --- a/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts +++ b/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts @@ -5,7 +5,7 @@ 'use strict'; import * as sqlops from 'sqlops'; -import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; +import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; import * as types from 'vs/base/common/types'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/editData/editor/editDataEditor.ts b/src/sql/parts/editData/editor/editDataEditor.ts index c13ae3c833..e63f65d6ee 100644 --- a/src/sql/parts/editData/editor/editDataEditor.ts +++ b/src/sql/parts/editData/editor/editDataEditor.ts @@ -26,7 +26,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { Action } from 'vs/base/common/actions'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { IEditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; +import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService'; import { RefreshTableAction, StopRefreshTableAction, ChangeMaxRowsAction, ChangeMaxRowsActionItem, ShowQueryPaneAction } from 'sql/parts/editData/execution/editDataActions'; diff --git a/src/sql/parts/grid/services/dataService.ts b/src/sql/parts/grid/services/dataService.ts index 16c2ee4300..f45c684c7d 100644 --- a/src/sql/parts/grid/services/dataService.ts +++ b/src/sql/parts/grid/services/dataService.ts @@ -15,7 +15,7 @@ import { ResultSerializer } from 'sql/platform/node/resultSerializer'; import { ISaveRequest } from 'sql/parts/grid/common/interfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; /** * DataService handles the interactions between QueryModel and app.component. Thus, it handles diff --git a/src/sql/parts/grid/views/editData/editData.component.ts b/src/sql/parts/grid/views/editData/editData.component.ts index c1fcba893f..fd2627ce60 100644 --- a/src/sql/parts/grid/views/editData/editData.component.ts +++ b/src/sql/parts/grid/views/editData/editData.component.ts @@ -22,7 +22,7 @@ import { GridParentComponent } from 'sql/parts/grid/views/gridParentComponent'; import { EditDataGridActionProvider } from 'sql/parts/grid/views/editData/editDataGridActions'; import { error } from 'sql/base/common/log'; import { clone, mixin } from 'sql/base/common/objects'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; diff --git a/src/sql/parts/grid/views/gridParentComponent.ts b/src/sql/parts/grid/views/gridParentComponent.ts index 6be7b98205..28a5852020 100644 --- a/src/sql/parts/grid/views/gridParentComponent.ts +++ b/src/sql/parts/grid/views/gridParentComponent.ts @@ -25,7 +25,7 @@ import * as Services from 'sql/parts/grid/services/sharedServices'; import * as GridContentEvents from 'sql/parts/grid/common/gridContentEvents'; import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/parts/query/common/queryContext'; import { error } from 'sql/base/common/log'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; import { IAction } from 'vs/base/common/actions'; diff --git a/src/sql/parts/jobManagement/views/jobsView.component.ts b/src/sql/parts/jobManagement/views/jobsView.component.ts index 3dffda8e37..cac271eb0a 100644 --- a/src/sql/parts/jobManagement/views/jobsView.component.ts +++ b/src/sql/parts/jobManagement/views/jobsView.component.ts @@ -36,7 +36,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { escape } from 'sql/base/common/strings'; import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { tableBackground, cellBackground, cellBorderColor } from 'sql/common/theme/colors'; +import { tableBackground, cellBackground, cellBorderColor } from 'sql/platform/theme/common/colors'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; diff --git a/src/sql/parts/modelComponents/button.component.ts b/src/sql/parts/modelComponents/button.component.ts index 836a5e477d..2752735a60 100644 --- a/src/sql/parts/modelComponents/button.component.ts +++ b/src/sql/parts/modelComponents/button.component.ts @@ -12,7 +12,7 @@ import * as sqlops from 'sqlops'; import { ComponentWithIconBase } from 'sql/parts/modelComponents/componentWithIconBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import { attachButtonStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_FOREGROUND } from 'vs/workbench/common/theme'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/parts/modelComponents/checkbox.component.ts b/src/sql/parts/modelComponents/checkbox.component.ts index b58744fd59..e3349ea69c 100644 --- a/src/sql/parts/modelComponents/checkbox.component.ts +++ b/src/sql/parts/modelComponents/checkbox.component.ts @@ -14,7 +14,7 @@ import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { attachCheckboxStyler } from 'sql/common/theme/styler'; +import { attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; @Component({ @@ -33,7 +33,7 @@ export default class CheckBoxComponent extends ComponentBase implements ICompone @Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface, @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, @Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService, - @Inject(forwardRef(() => ElementRef)) el: ElementRef,) { + @Inject(forwardRef(() => ElementRef)) el: ElementRef, ) { super(changeRef, el); } diff --git a/src/sql/parts/modelComponents/dropdown.component.ts b/src/sql/parts/modelComponents/dropdown.component.ts index be4cd88361..6503bcd9c0 100644 --- a/src/sql/parts/modelComponents/dropdown.component.ts +++ b/src/sql/parts/modelComponents/dropdown.component.ts @@ -14,7 +14,7 @@ import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown/dropdown'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; -import { attachEditableDropdownStyler } from 'sql/common/theme/styler'; +import { attachEditableDropdownStyler } from 'sql/platform/theme/common/styler'; import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/parts/modelComponents/fileBrowserTree.component.ts b/src/sql/parts/modelComponents/fileBrowserTree.component.ts index 2f52dcf51f..049a732c08 100644 --- a/src/sql/parts/modelComponents/fileBrowserTree.component.ts +++ b/src/sql/parts/modelComponents/fileBrowserTree.component.ts @@ -12,9 +12,9 @@ import * as sqlops from 'sqlops'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { FileBrowserViewModel } from '../fileBrowser/fileBrowserViewModel'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; -import { FileBrowserTreeView } from '../fileBrowser/fileBrowserTreeView'; +import { FileBrowserViewModel } from 'sql/workbench/services/fileBrowser/common/fileBrowserViewModel'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; +import { FileBrowserTreeView } from 'sql/workbench/services/fileBrowser/browser/fileBrowserTreeView'; @Component({ selector: 'modelview-fileBrowserTree', diff --git a/src/sql/parts/modelComponents/inputbox.component.ts b/src/sql/parts/modelComponents/inputbox.component.ts index 45006b7013..5a7669d75f 100644 --- a/src/sql/parts/modelComponents/inputbox.component.ts +++ b/src/sql/parts/modelComponents/inputbox.component.ts @@ -13,7 +13,7 @@ import * as sqlops from 'sqlops'; import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import { attachInputBoxStyler } from 'sql/common/theme/styler'; +import { attachInputBoxStyler } from 'sql/platform/theme/common/styler'; import { IInputOptions, MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/parts/modelComponents/listbox.component.ts b/src/sql/parts/modelComponents/listbox.component.ts index 2a26937308..e16719b08f 100644 --- a/src/sql/parts/modelComponents/listbox.component.ts +++ b/src/sql/parts/modelComponents/listbox.component.ts @@ -14,7 +14,7 @@ import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { ListBox } from 'sql/base/browser/ui/listBox/listBox'; -import { attachListBoxStyler } from 'sql/common/theme/styler'; +import { attachListBoxStyler } from 'sql/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/modelComponents/table.component.ts b/src/sql/parts/modelComponents/table.component.ts index 854aaa8548..c5766b7d87 100644 --- a/src/sql/parts/modelComponents/table.component.ts +++ b/src/sql/parts/modelComponents/table.component.ts @@ -16,7 +16,7 @@ import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } fro import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom'; import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin'; diff --git a/src/sql/parts/notebook/notebook.component.ts b/src/sql/parts/notebook/notebook.component.ts index acc1b092b2..cf172672e6 100644 --- a/src/sql/parts/notebook/notebook.component.ts +++ b/src/sql/parts/notebook/notebook.component.ts @@ -30,8 +30,8 @@ import { VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/parts/extensions/co import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { AngularDisposable } from 'sql/base/node/lifecycle'; import { CellTypes, CellType } from 'sql/parts/notebook/models/contracts'; -import { ICellModel, IModelFactory, notebookConstants, INotebookModel, NotebookContentChange } from 'sql/parts/notebook/models/modelInterfaces'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; +import { ICellModel, IModelFactory, INotebookModel, NotebookContentChange, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_FILETYPE, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { NotebookModel } from 'sql/parts/notebook/models/notebookModel'; @@ -41,12 +41,13 @@ import { Deferred } from 'sql/base/common/promise'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, SaveNotebookAction } from 'sql/parts/notebook/notebookActions'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; import { IResourceInput } from 'vs/platform/editor/common/editor'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; export const NOTEBOOK_SELECTOR: string = 'notebook-component'; diff --git a/src/sql/parts/notebook/notebookActions.ts b/src/sql/parts/notebook/notebookActions.ts index bdcf097797..f1dcadb555 100644 --- a/src/sql/parts/notebook/notebookActions.ts +++ b/src/sql/parts/notebook/notebookActions.ts @@ -16,10 +16,11 @@ import { INotebookModel, IDefaultConnection } from 'sql/parts/notebook/models/mo import { CellType } from 'sql/parts/notebook/models/contracts'; import { NotebookComponent } from 'sql/parts/notebook/notebook.component'; import { getErrorMessage, formatServerNameWithDatabaseNameForAttachTo, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/parts/notebook/notebookUtils'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { noKernel } from 'sql/workbench/services/notebook/common/sessionManager'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; const msgLoading = localize('loading', 'Loading kernels...'); const kernelLabel: string = localize('Kernel', 'Kernel: '); @@ -115,7 +116,7 @@ export interface IActionStateData { export class IMultiStateData { private _stateMap = new Map(); - constructor(mappings: { key: T, value: IActionStateData}[], private _state: T, private _baseClass?: string) { + constructor(mappings: { key: T, value: IActionStateData }[], private _state: T, private _baseClass?: string) { if (mappings) { mappings.forEach(s => this._stateMap.set(s.key, s.value)); } diff --git a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts index 371faf74bd..e95eb2bc6f 100644 --- a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts +++ b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts @@ -20,10 +20,10 @@ import { localize } from 'vs/nls'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel'; -import { attachButtonStyler, attachModalDialogStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; diff --git a/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts b/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts index 9c9b50c0fd..226665cc8f 100644 --- a/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts +++ b/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts @@ -9,7 +9,7 @@ import { Action } from 'vs/base/common/actions'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { ConnectionViewlet } from 'sql/workbench/parts/connection/electron-browser/connectionViewlet'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -17,7 +17,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectio import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import * as Constants from 'sql/platform/connection/common/constants'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import Severity from 'vs/base/common/severity'; import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; diff --git a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts index af7c1bc1ab..c699dbe72d 100644 --- a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts +++ b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts @@ -23,8 +23,8 @@ import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtil import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import * as Constants from 'sql/platform/connection/common/constants'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts index f9934d23af..125332f64c 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts @@ -8,7 +8,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectio import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { TPromise } from 'vs/base/common/winjs.base'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts index cb0f51a0ad..eff811b95e 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts @@ -23,10 +23,10 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Button } from 'sql/base/browser/ui/button/button'; -import { attachButtonStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { Event, Emitter } from 'vs/base/common/event'; import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; diff --git a/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts b/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts index cdfc448c3f..18f3137645 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts @@ -6,7 +6,7 @@ import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts b/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts index 1507ef8238..4ef5b60413 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts @@ -7,7 +7,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectio import { IConnectionManagementService, IConnectionCompletionOptions, IConnectionCallbacks } from 'sql/platform/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts b/src/sql/parts/profiler/contrib/profilerActions.contribution.ts index 68a68ca78b..6c419cd674 100644 --- a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts +++ b/src/sql/parts/profiler/contrib/profilerActions.contribution.ts @@ -7,8 +7,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; -import { IObjectExplorerService } from '../../objectExplorer/common/objectExplorerService'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { TPromise } from 'vs/base/common/winjs.base'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; @@ -20,6 +19,8 @@ import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/o import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; CommandsRegistry.registerCommand({ id: 'profiler.newProfiler', diff --git a/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts b/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts index 2c88605291..f7cc4b1bda 100644 --- a/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts +++ b/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts @@ -5,8 +5,8 @@ 'use strict'; import 'vs/css!sql/parts/profiler/media/profiler'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; -import { attachModalDialogStyler } from 'sql/common/theme/styler'; +import { Modal } from 'sql/workbench/browser/modal/modal'; +import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; diff --git a/src/sql/parts/profiler/dialog/profilerFilterDialog.ts b/src/sql/parts/profiler/dialog/profilerFilterDialog.ts index 4c1eb91922..5ebdb873db 100644 --- a/src/sql/parts/profiler/dialog/profilerFilterDialog.ts +++ b/src/sql/parts/profiler/dialog/profilerFilterDialog.ts @@ -7,9 +7,9 @@ import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!./media/profilerFilterDialog'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { attachButtonStyler, attachModalDialogStyler, attachInputBoxStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler, attachModalDialogStyler, attachInputBoxStyler } from 'sql/platform/theme/common/styler'; import { KeyCode } from 'vs/base/common/keyCodes'; import { Builder } from 'vs/base/browser/builder'; import { IThemeService } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts b/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts index dbe6106c7b..832ae60267 100644 --- a/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts +++ b/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts @@ -6,7 +6,7 @@ import { IProfilerController } from './interfaces'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { Table } from 'sql/base/browser/ui/table/table'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin'; import { IProfilerStateChangedEvent } from 'sql/parts/profiler/editor/profilerState'; import { FindWidget, ITableController, IConfigurationChangedEvent, ACTION_IDS } from './profilerFindWidget'; diff --git a/src/sql/parts/profiler/editor/profilerEditor.ts b/src/sql/parts/profiler/editor/profilerEditor.ts index dbc75cbf1e..58ea1746bd 100644 --- a/src/sql/parts/profiler/editor/profilerEditor.ts +++ b/src/sql/parts/profiler/editor/profilerEditor.ts @@ -9,7 +9,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/common/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { IProfilerStateChangedEvent } from './profilerState'; import { ProfilerTableEditor, ProfilerTableViewState } from './controller/profilerTableEditor'; import * as Actions from 'sql/parts/profiler/contrib/profilerActions'; diff --git a/src/sql/parts/query/common/queryInput.ts b/src/sql/parts/query/common/queryInput.ts index 0c72e09110..c686966648 100644 --- a/src/sql/parts/query/common/queryInput.ts +++ b/src/sql/parts/query/common/queryInput.ts @@ -16,7 +16,7 @@ import { IEditorViewState } from 'vs/editor/common/editorCommon'; import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { ISelectionData, ExecutionPlanOptions } from 'sqlops'; diff --git a/src/sql/parts/query/editor/charting/insights/tableInsight.ts b/src/sql/parts/query/editor/charting/insights/tableInsight.ts index fcf91fb90b..f55b4bdefb 100644 --- a/src/sql/parts/query/editor/charting/insights/tableInsight.ts +++ b/src/sql/parts/query/editor/charting/insights/tableInsight.ts @@ -9,7 +9,7 @@ import { IInsight, InsightType } from './interfaces'; import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { Table } from 'sql/base/browser/ui/table/table'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; import { $, Dimension } from 'vs/base/browser/dom'; diff --git a/src/sql/parts/query/editor/gridPanel.ts b/src/sql/parts/query/editor/gridPanel.ts index 1b1987955d..0fff35dfae 100644 --- a/src/sql/parts/query/editor/gridPanel.ts +++ b/src/sql/parts/query/editor/gridPanel.ts @@ -6,7 +6,7 @@ import * as pretty from 'pretty-data'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import QueryRunner from 'sql/platform/query/common/queryRunner'; import { VirtualizedCollection, AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView'; import { Table } from 'sql/base/browser/ui/table/table'; diff --git a/src/sql/parts/query/editor/queryEditor.ts b/src/sql/parts/query/editor/queryEditor.ts index 11c262e44d..6313ffc2a3 100644 --- a/src/sql/parts/query/editor/queryEditor.ts +++ b/src/sql/parts/query/editor/queryEditor.ts @@ -43,7 +43,7 @@ import { ActualQueryPlanAction } from 'sql/parts/query/execution/queryActions'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { IEditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; +import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { CancellationToken } from 'vs/base/common/cancellation'; diff --git a/src/sql/parts/query/execution/queryActions.ts b/src/sql/parts/query/execution/queryActions.ts index fdafae6e48..b9f3eb0d81 100644 --- a/src/sql/parts/query/execution/queryActions.ts +++ b/src/sql/parts/query/execution/queryActions.ts @@ -13,7 +13,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/common/theme/styler'; +import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler'; import { ISelectionData } from 'sqlops'; import { diff --git a/src/sql/parts/queryPlan/queryPlanEditor.ts b/src/sql/parts/queryPlan/queryPlanEditor.ts index 5817d4a26d..dc91391e60 100644 --- a/src/sql/parts/queryPlan/queryPlanEditor.ts +++ b/src/sql/parts/queryPlan/queryPlanEditor.ts @@ -16,7 +16,7 @@ import { QueryPlanModule } from 'sql/parts/queryPlan/queryPlan.module'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; import { IQueryPlanParams } from 'sql/services/bootstrap/bootstrapParams'; import { QUERYPLAN_SELECTOR } from 'sql/parts/queryPlan/queryPlan.component'; diff --git a/src/sql/parts/queryPlan/topOperations.component.ts b/src/sql/parts/queryPlan/topOperations.component.ts index 82d3b2564c..8c74eaccf0 100644 --- a/src/sql/parts/queryPlan/topOperations.component.ts +++ b/src/sql/parts/queryPlan/topOperations.component.ts @@ -9,7 +9,7 @@ import { Subscription, Subject } from 'rxjs/Rx'; import { PlanXmlParser, PlanNode } from 'sql/parts/queryPlan/planXmlParser'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { IQueryComponentParams } from 'sql/services/bootstrap/bootstrapParams'; import * as GridContentEvents from 'sql/parts/grid/common/gridContentEvents'; import { DataService } from 'sql/parts/grid/services/dataService'; diff --git a/src/sql/parts/queryPlan/topOperations.ts b/src/sql/parts/queryPlan/topOperations.ts index 17e8008288..b6f289f6d5 100644 --- a/src/sql/parts/queryPlan/topOperations.ts +++ b/src/sql/parts/queryPlan/topOperations.ts @@ -12,7 +12,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { PlanXmlParser } from 'sql/parts/queryPlan/planXmlParser'; import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { attachTableStyler } from 'sql/common/theme/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; diff --git a/src/sql/parts/taskHistory/viewlet/taskAction.ts b/src/sql/parts/taskHistory/viewlet/taskAction.ts index 1cde9a3fb3..366bcd255e 100644 --- a/src/sql/parts/taskHistory/viewlet/taskAction.ts +++ b/src/sql/parts/taskHistory/viewlet/taskAction.ts @@ -8,7 +8,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { TaskNode } from 'sql/parts/taskHistory/common/taskNode'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import Severity from 'vs/base/common/severity'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/platform/accountManagement/browser/accountPicker.ts b/src/sql/platform/accountManagement/browser/accountPicker.ts index b5276d2617..ff800a1f31 100644 --- a/src/sql/platform/accountManagement/browser/accountPicker.ts +++ b/src/sql/platform/accountManagement/browser/accountPicker.ts @@ -21,7 +21,7 @@ import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import * as sqlops from 'sqlops'; import { DropdownList } from 'sql/base/browser/ui/dropdownList/dropdownList'; -import { attachDropdownStyler } from 'sql/common/theme/styler'; +import { attachDropdownStyler } from 'sql/platform/theme/common/styler'; import { AddAccountAction, RefreshAccountAction } from 'sql/parts/accountManagement/common/accountActions'; import { AccountPickerListRenderer, AccountListDelegate } from 'sql/parts/accountManagement/common/accountListRenderer'; import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/accountPickerViewModel'; diff --git a/src/sql/platform/backup/common/backupService.ts b/src/sql/platform/backup/common/backupService.ts index 2e8ddbf271..69d58b3496 100644 --- a/src/sql/platform/backup/common/backupService.ts +++ b/src/sql/platform/backup/common/backupService.ts @@ -6,11 +6,8 @@ 'use strict'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { Event } from 'vs/base/common/event'; import * as sqlops from 'sqlops'; -import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; - export enum TaskExecutionMode { execute = 0, script = 1, @@ -18,33 +15,6 @@ export enum TaskExecutionMode { } export const SERVICE_ID = 'backupService'; -export const UI_SERVICE_ID = 'backupUiService'; - -export const IBackupUiService = createDecorator(UI_SERVICE_ID); - -export interface IBackupUiService { - _serviceBrand: any; - - /** - * Show backup wizard - */ - showBackup(connection: IConnectionProfile): Promise; - - /** - * On show backup event - */ - onShowBackupEvent: Event<{ connection: IConnectionProfile, ownerUri: string }>; - - /** - * Close backup wizard - */ - closeBackup(); - - /** - * After the backup dialog is rendered, run Modal methods to set focusable elements, etc. - */ - onShowBackupDialog(); -} export const IBackupService = createDecorator(SERVICE_ID); diff --git a/src/sql/platform/connection/common/connectionManagement.ts b/src/sql/platform/connection/common/connectionManagement.ts index f8cfd8cdbd..705830a1a1 100644 --- a/src/sql/platform/connection/common/connectionManagement.ts +++ b/src/sql/platform/connection/common/connectionManagement.ts @@ -279,29 +279,6 @@ export interface IConnectionManagementService { getConnectionProfileById(profileId: string): IConnectionProfile; } -export const IConnectionDialogService = createDecorator('connectionDialogService'); -export interface IConnectionDialogService { - _serviceBrand: any; - /** - * Opens the connection dialog and returns the promise for successfully opening the dialog - * @param connectionManagementService - * @param params - * @param model - * @param connectionResult - */ - showDialog(connectionManagementService: IConnectionManagementService, params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult): Thenable; - - /** - * Opens the connection dialog and returns the promise when connection is made - * or dialog is closed - * @param connectionManagementService - * @param params - * @param model - * @param connectionResult - */ - openDialogAndWait(connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Thenable; -} - export enum RunQueryOnConnectionMode { none = 0, executeQuery = 1, diff --git a/src/sql/platform/connection/common/connectionManagementService.ts b/src/sql/platform/connection/common/connectionManagementService.ts index bce270a8a5..489714fc60 100644 --- a/src/sql/platform/connection/common/connectionManagementService.ts +++ b/src/sql/platform/connection/common/connectionManagementService.ts @@ -7,7 +7,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import { - IConnectionManagementService, IConnectionDialogService, INewConnectionParams, + IConnectionManagementService, INewConnectionParams, ConnectionType, IConnectableInput, IConnectionCompletionOptions, IConnectionCallbacks, IConnectionParams, IConnectionResult, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; @@ -46,7 +46,6 @@ import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/commo import * as platform from 'vs/platform/registry/common/platform'; import { Memento } from 'vs/workbench/common/memento'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService'; @@ -56,9 +55,8 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart'; import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar'; -import { ICommandService } from 'vs/platform/commands/common/commands'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; export class ConnectionManagementService extends Disposable implements IConnectionManagementService { @@ -84,13 +82,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti constructor( private _connectionMemento: Memento, private _connectionStore: ConnectionStore, + @IStorageService _storageService: IStorageService, @IConnectionDialogService private _connectionDialogService: IConnectionDialogService, @IServerGroupController private _serverGroupController: IServerGroupController, - @ICommandService private _commandService: ICommandService, @IInstantiationService private _instantiationService: IInstantiationService, @IEditorService private _editorService: IEditorService, - @IWorkspaceContextService private _contextService: IWorkspaceContextService, - @IStorageService private _storageService: IStorageService, @ITelemetryService private _telemetryService: ITelemetryService, @IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService, @ICredentialsService private _credentialsService: ICredentialsService, @@ -99,7 +95,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti @IEditorGroupsService private _editorGroupService: IEditorGroupsService, @IStatusbarService private _statusBarService: IStatusbarService, @IResourceProviderService private _resourceProviderService: IResourceProviderService, - @IViewletService private _viewletService: IViewletService, @IAngularEventingService private _angularEventing: IAngularEventingService, @IAccountManagementService private _accountManagementService: IAccountManagementService ) { diff --git a/src/sql/platform/dialog/customDialogService.ts b/src/sql/platform/dialog/customDialogService.ts index c374f35a53..773b04b2a0 100644 --- a/src/sql/platform/dialog/customDialogService.ts +++ b/src/sql/platform/dialog/customDialogService.ts @@ -6,11 +6,11 @@ 'use strict'; import * as sqlops from 'sqlops'; -import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog'; +import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { DialogModal } from 'sql/platform/dialog/dialogModal'; import { WizardModal } from 'sql/platform/dialog/wizardModal'; import { Dialog, Wizard, DialogTab } from 'sql/platform/dialog/dialogTypes'; -import { IModalOptions } from 'sql/base/browser/ui/modal/modal'; +import { IModalOptions } from 'sql/workbench/browser/modal/modal'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; const defaultOptions: IModalOptions = { hasBackButton: false, isWide: false, hasErrors: true }; diff --git a/src/sql/platform/dialog/dialogModal.ts b/src/sql/platform/dialog/dialogModal.ts index cd2d7062dc..95b57d8365 100644 --- a/src/sql/platform/dialog/dialogModal.ts +++ b/src/sql/platform/dialog/dialogModal.ts @@ -6,8 +6,8 @@ 'use strict'; import 'vs/css!./media/dialogModal'; -import { Modal, IModalOptions } from 'sql/base/browser/ui/modal/modal'; -import { attachModalDialogStyler } from 'sql/common/theme/styler'; +import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal'; +import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { Dialog, DialogButton } from 'sql/platform/dialog/dialogTypes'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; diff --git a/src/sql/platform/dialog/dialogPane.ts b/src/sql/platform/dialog/dialogPane.ts index f6142ef2d3..9c837f9627 100644 --- a/src/sql/platform/dialog/dialogPane.ts +++ b/src/sql/platform/dialog/dialogPane.ts @@ -9,7 +9,7 @@ import 'vs/css!./media/dialogModal'; import { NgModuleRef } from '@angular/core'; -import { IModalDialogStyles } from 'sql/base/browser/ui/modal/modal'; +import { IModalDialogStyles } from 'sql/workbench/browser/modal/modal'; import { DialogTab } from 'sql/platform/dialog/dialogTypes'; import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel'; import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; diff --git a/src/sql/platform/dialog/wizardModal.ts b/src/sql/platform/dialog/wizardModal.ts index 26d4448737..ae42047e8a 100644 --- a/src/sql/platform/dialog/wizardModal.ts +++ b/src/sql/platform/dialog/wizardModal.ts @@ -6,8 +6,8 @@ 'use strict'; import 'vs/css!./media/dialogModal'; -import { Modal, IModalOptions } from 'sql/base/browser/ui/modal/modal'; -import { attachModalDialogStyler } from 'sql/common/theme/styler'; +import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal'; +import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { Wizard, DialogButton, WizardPage } from 'sql/platform/dialog/dialogTypes'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; diff --git a/src/sql/platform/fileBrowser/common/fileBrowserService.ts b/src/sql/platform/fileBrowser/common/fileBrowserService.ts index f43914faa4..fce703ccca 100644 --- a/src/sql/platform/fileBrowser/common/fileBrowserService.ts +++ b/src/sql/platform/fileBrowser/common/fileBrowserService.ts @@ -7,8 +7,8 @@ import * as sqlops from 'sqlops'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { FileBrowserTree } from 'sql/parts/fileBrowser/common/fileBrowserTree'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; +import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import * as Constants from 'sql/common/constants'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/platform/fileBrowser/common/interfaces.ts b/src/sql/platform/fileBrowser/common/interfaces.ts index bd9c6596ac..b373ecf9dd 100644 --- a/src/sql/platform/fileBrowser/common/interfaces.ts +++ b/src/sql/platform/fileBrowser/common/interfaces.ts @@ -6,25 +6,11 @@ 'use strict'; import * as sqlops from 'sqlops'; -import { FileBrowserTree } from 'sql/parts/fileBrowser/common/fileBrowserTree'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; +import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -export const IFileBrowserDialogController = createDecorator('fileBrowserDialogService'); -export interface IFileBrowserDialogController { - _serviceBrand: any; - /** - * Show file browser dialog - */ - showDialog(ownerUri: string, - expandPath: string, - fileFilters: { label: string, filters: string[] }[], - fileValidationServiceType: string, - isWide: boolean, - handleOnOk: (path: string) => void): void; -} - export const IFileBrowserService = createDecorator('fileBrowserService'); export interface IFileBrowserService { _serviceBrand: any; diff --git a/src/sql/platform/restore/common/restoreServiceImpl.ts b/src/sql/platform/restore/common/restoreServiceImpl.ts index edd61dfd9b..2e7da9f9c7 100644 --- a/src/sql/platform/restore/common/restoreServiceImpl.ts +++ b/src/sql/platform/restore/common/restoreServiceImpl.ts @@ -13,14 +13,14 @@ import * as sqlops from 'sqlops'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService'; -import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog'; +import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { RestoreDialog } from 'sql/parts/disasterRecovery/restore/restoreDialog'; import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import * as Utils from 'sql/platform/connection/common/utils'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { TaskStatus, TaskNode } from 'sql/parts/taskHistory/common/taskNode'; import * as Constants from 'sql/common/constants'; diff --git a/src/sql/platform/taskHistory/common/taskService.ts b/src/sql/platform/taskHistory/common/taskService.ts index 283d51d4c2..2bea373799 100644 --- a/src/sql/platform/taskHistory/common/taskService.ts +++ b/src/sql/platform/taskHistory/common/taskService.ts @@ -6,7 +6,7 @@ 'use strict'; import * as sqlops from 'sqlops'; import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event, Emitter } from 'vs/base/common/event'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; diff --git a/src/sql/common/theme/colors.ts b/src/sql/platform/theme/common/colors.ts similarity index 100% rename from src/sql/common/theme/colors.ts rename to src/sql/platform/theme/common/colors.ts diff --git a/src/sql/common/theme/styler.ts b/src/sql/platform/theme/common/styler.ts similarity index 100% rename from src/sql/common/theme/styler.ts rename to src/sql/platform/theme/common/styler.ts diff --git a/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts b/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts index fbeb8ccf35..750d8dfa05 100644 --- a/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts +++ b/src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts @@ -3,14 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { WebViewDialog } from 'sql/base/browser/ui/modal/webViewDialog'; +import 'vs/css!sql/media/icons/common-icons'; +import { WebViewDialog } from 'sql/workbench/parts/webview/electron-browser/webViewDialog'; import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; + import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; -import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import 'vs/css!sql/media/icons/common-icons'; @extHostNamedCustomer(SqlMainContext.MainThreadModalDialog) export class MainThreadModalDialog implements MainThreadModalDialogShape { @@ -19,7 +19,6 @@ export class MainThreadModalDialog implements MainThreadModalDialogShape { constructor( context: IExtHostContext, - @IEditorService private readonly _editorService: IEditorService, @IInstantiationService private readonly _instantiationService: IInstantiationService ) { this._proxy = context.getProxy(SqlExtHostContext.ExtHostModalDialogs); diff --git a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts index ac0c06eda4..5c67612de5 100644 --- a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts +++ b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts @@ -8,8 +8,8 @@ import { SqlExtHostContext, SqlMainContext, ExtHostConnectionManagementShape, Ma import * as sqlops from 'sqlops'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -18,6 +18,7 @@ import { isUndefinedOrNull } from 'vs/base/common/types'; import { generateUuid } from 'vs/base/common/uuid'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; @extHostNamedCustomer(SqlMainContext.MainThreadConnectionManagement) export class MainThreadConnectionManagement implements MainThreadConnectionManagementShape { diff --git a/src/sql/workbench/api/node/mainThreadDataProtocol.ts b/src/sql/workbench/api/node/mainThreadDataProtocol.ts index e7f99f767e..fa5fbe11e9 100644 --- a/src/sql/workbench/api/node/mainThreadDataProtocol.ts +++ b/src/sql/workbench/api/node/mainThreadDataProtocol.ts @@ -15,7 +15,7 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import * as sqlops from 'sqlops'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; -import { IObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; diff --git a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts index 31d4104c1b..519ec8fb4b 100644 --- a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts +++ b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts @@ -10,7 +10,7 @@ import * as vscode from 'vscode'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/api/node/mainThreadQueryEditor.ts b/src/sql/workbench/api/node/mainThreadQueryEditor.ts index d45f6822f9..2ef4dd1d98 100644 --- a/src/sql/workbench/api/node/mainThreadQueryEditor.ts +++ b/src/sql/workbench/api/node/mainThreadQueryEditor.ts @@ -8,7 +8,7 @@ import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQ import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/base/browser/ui/modal/dialogHelper.ts b/src/sql/workbench/browser/modal/dialogHelper.ts similarity index 100% rename from src/sql/base/browser/ui/modal/dialogHelper.ts rename to src/sql/workbench/browser/modal/dialogHelper.ts diff --git a/src/sql/base/browser/ui/modal/media/back.svg b/src/sql/workbench/browser/modal/media/back.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/back.svg rename to src/sql/workbench/browser/modal/media/back.svg diff --git a/src/sql/base/browser/ui/modal/media/back_inverse.svg b/src/sql/workbench/browser/modal/media/back_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/back_inverse.svg rename to src/sql/workbench/browser/modal/media/back_inverse.svg diff --git a/src/sql/base/browser/ui/modal/media/close.svg b/src/sql/workbench/browser/modal/media/close.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/close.svg rename to src/sql/workbench/browser/modal/media/close.svg diff --git a/src/sql/base/browser/ui/modal/media/close_inverse.svg b/src/sql/workbench/browser/modal/media/close_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/close_inverse.svg rename to src/sql/workbench/browser/modal/media/close_inverse.svg diff --git a/src/sql/base/browser/ui/modal/media/copy.svg b/src/sql/workbench/browser/modal/media/copy.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/copy.svg rename to src/sql/workbench/browser/modal/media/copy.svg diff --git a/src/sql/base/browser/ui/modal/media/copy_inverse.svg b/src/sql/workbench/browser/modal/media/copy_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/copy_inverse.svg rename to src/sql/workbench/browser/modal/media/copy_inverse.svg diff --git a/src/sql/base/browser/ui/modal/media/error_notification.svg b/src/sql/workbench/browser/modal/media/error_notification.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/error_notification.svg rename to src/sql/workbench/browser/modal/media/error_notification.svg diff --git a/src/sql/base/browser/ui/modal/media/error_notification_inverse.svg b/src/sql/workbench/browser/modal/media/error_notification_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/error_notification_inverse.svg rename to src/sql/workbench/browser/modal/media/error_notification_inverse.svg diff --git a/src/sql/base/browser/ui/modal/media/info_notification.svg b/src/sql/workbench/browser/modal/media/info_notification.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/info_notification.svg rename to src/sql/workbench/browser/modal/media/info_notification.svg diff --git a/src/sql/base/browser/ui/modal/media/info_notification_inverse.svg b/src/sql/workbench/browser/modal/media/info_notification_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/info_notification_inverse.svg rename to src/sql/workbench/browser/modal/media/info_notification_inverse.svg diff --git a/src/sql/base/browser/ui/modal/media/modal.css b/src/sql/workbench/browser/modal/media/modal.css similarity index 100% rename from src/sql/base/browser/ui/modal/media/modal.css rename to src/sql/workbench/browser/modal/media/modal.css diff --git a/src/sql/base/browser/ui/modal/media/optionsDialog.css b/src/sql/workbench/browser/modal/media/optionsDialog.css similarity index 97% rename from src/sql/base/browser/ui/modal/media/optionsDialog.css rename to src/sql/workbench/browser/modal/media/optionsDialog.css index c87a8ea065..c39f536271 100644 --- a/src/sql/base/browser/ui/modal/media/optionsDialog.css +++ b/src/sql/workbench/browser/modal/media/optionsDialog.css @@ -62,9 +62,9 @@ } .optionsDialog-description { - height: 90px; - margin: 15px; - overflow-y: auto; + height: 90px; + margin: 15px; + overflow-y: auto; } .optionsDialog-description .modal-title { @@ -101,4 +101,4 @@ td.optionsDialog-input.select-container { padding-right: 9px; -} \ No newline at end of file +} diff --git a/src/sql/base/browser/ui/modal/media/show_details.svg b/src/sql/workbench/browser/modal/media/show_details.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/show_details.svg rename to src/sql/workbench/browser/modal/media/show_details.svg diff --git a/src/sql/base/browser/ui/modal/media/show_details_inverse.svg b/src/sql/workbench/browser/modal/media/show_details_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/show_details_inverse.svg rename to src/sql/workbench/browser/modal/media/show_details_inverse.svg diff --git a/src/sql/base/browser/ui/modal/media/warning_notification.svg b/src/sql/workbench/browser/modal/media/warning_notification.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/warning_notification.svg rename to src/sql/workbench/browser/modal/media/warning_notification.svg diff --git a/src/sql/base/browser/ui/modal/media/warning_notification_inverse.svg b/src/sql/workbench/browser/modal/media/warning_notification_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/modal/media/warning_notification_inverse.svg rename to src/sql/workbench/browser/modal/media/warning_notification_inverse.svg diff --git a/src/sql/base/browser/ui/modal/modal.ts b/src/sql/workbench/browser/modal/modal.ts similarity index 100% rename from src/sql/base/browser/ui/modal/modal.ts rename to src/sql/workbench/browser/modal/modal.ts diff --git a/src/sql/base/browser/ui/modal/optionsDialog.ts b/src/sql/workbench/browser/modal/optionsDialog.ts similarity index 99% rename from src/sql/base/browser/ui/modal/optionsDialog.ts rename to src/sql/workbench/browser/modal/optionsDialog.ts index f282123d7b..6a44038d98 100644 --- a/src/sql/base/browser/ui/modal/optionsDialog.ts +++ b/src/sql/workbench/browser/modal/optionsDialog.ts @@ -10,7 +10,7 @@ import * as DialogHelper from './dialogHelper'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IModalOptions, Modal } from './modal'; import * as OptionsDialogHelper from './optionsDialogHelper'; -import { attachButtonStyler, attachModalDialogStyler, attachPanelStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler, attachModalDialogStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ScrollableSplitView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; diff --git a/src/sql/base/browser/ui/modal/optionsDialogHelper.ts b/src/sql/workbench/browser/modal/optionsDialogHelper.ts similarity index 100% rename from src/sql/base/browser/ui/modal/optionsDialogHelper.ts rename to src/sql/workbench/browser/modal/optionsDialogHelper.ts diff --git a/src/sql/workbench/common/actions.ts b/src/sql/workbench/common/actions.ts index 6e19e78447..e65e3c25da 100644 --- a/src/sql/workbench/common/actions.ts +++ b/src/sql/workbench/common/actions.ts @@ -5,19 +5,19 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; -import { IBackupUiService } from 'sql/platform/backup/common/backupService'; import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; -import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; +import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import * as Constants from 'sql/common/constants'; import { Task } from 'sql/platform/tasks/common/tasks'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; +import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; import { ObjectMetadata } from 'sqlops'; diff --git a/src/sql/workbench/common/taskUtilities.ts b/src/sql/workbench/common/taskUtilities.ts index 220141af65..751f8f8f29 100644 --- a/src/sql/workbench/common/taskUtilities.ts +++ b/src/sql/workbench/common/taskUtilities.ts @@ -12,20 +12,20 @@ import { IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode, IConnectionResult } from 'sql/platform/connection/common/connectionManagement'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; -import { IBackupUiService } from 'sql/platform/backup/common/backupService'; import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; +import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; +import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; import * as sqlops from 'sqlops'; diff --git a/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts index 928da9891b..622d6498fb 100644 --- a/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts +++ b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts @@ -23,7 +23,7 @@ import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { ClearSearchAction, AddServerAction, AddServerGroupAction, ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { warn } from 'sql/base/common/log'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { localize } from 'vs/nls'; diff --git a/src/sql/base/browser/ui/modal/webViewDialog.ts b/src/sql/workbench/parts/webview/electron-browser/webViewDialog.ts similarity index 92% rename from src/sql/base/browser/ui/modal/webViewDialog.ts rename to src/sql/workbench/parts/webview/electron-browser/webViewDialog.ts index 9bf57a26cf..5e5e8b1aac 100644 --- a/src/sql/base/browser/ui/modal/webViewDialog.ts +++ b/src/sql/workbench/parts/webview/electron-browser/webViewDialog.ts @@ -7,9 +7,9 @@ import 'vs/css!sql/media/icons/common-icons'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { attachButtonStyler, attachModalDialogStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { Builder } from 'vs/base/browser/builder'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IPartService, Parts } from 'vs/workbench/services/part/common/partService'; @@ -18,8 +18,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { localize } from 'vs/nls'; -import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -50,8 +48,6 @@ export class WebViewDialog extends Modal { @IPartService private _webViewPartService: IPartService, @ITelemetryService telemetryService: ITelemetryService, @IContextKeyService contextKeyService: IContextKeyService, - @IContextViewService private _contextViewService: IContextViewService, - @IEnvironmentService private _environmentService: IEnvironmentService, @IInstantiationService private _instantiationService: IInstantiationService ) { super('', TelemetryKeys.WebView, _webViewPartService, telemetryService, clipboardService, themeService, contextKeyService, { isFlyout: false, hasTitleIcon: true }); diff --git a/src/sql/workbench/parts/backup/browser/backupUiService.ts b/src/sql/workbench/services/backup/browser/backupUiService.ts similarity index 95% rename from src/sql/workbench/parts/backup/browser/backupUiService.ts rename to src/sql/workbench/services/backup/browser/backupUiService.ts index 061a62e0fe..1482b32b9c 100644 --- a/src/sql/workbench/parts/backup/browser/backupUiService.ts +++ b/src/sql/workbench/services/backup/browser/backupUiService.ts @@ -17,8 +17,9 @@ import * as ConnectionUtils from 'sql/platform/connection/common/utils'; import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { BackupDialog } from 'sql/parts/disasterRecovery/backup/backupDialog'; -import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog'; -import { IBackupUiService, IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; +import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; +import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; +import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; export class BackupUiService implements IBackupUiService { public _serviceBrand: any; diff --git a/src/sql/workbench/services/backup/common/backupUiService.ts b/src/sql/workbench/services/backup/common/backupUiService.ts new file mode 100644 index 0000000000..7b119ca7a3 --- /dev/null +++ b/src/sql/workbench/services/backup/common/backupUiService.ts @@ -0,0 +1,37 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { Event } from 'vs/base/common/event'; + +export const UI_SERVICE_ID = 'backupUiService'; +export const IBackupUiService = createDecorator(UI_SERVICE_ID); + +export interface IBackupUiService { + _serviceBrand: any; + + /** + * Show backup wizard + */ + showBackup(connection: IConnectionProfile): Promise; + + /** + * On show backup event + */ + onShowBackupEvent: Event<{ connection: IConnectionProfile, ownerUri: string }>; + + /** + * Close backup wizard + */ + closeBackup(); + + /** + * After the backup dialog is rendered, run Modal methods to set focusable elements, etc. + */ + onShowBackupDialog(); +} diff --git a/src/sql/workbench/services/commandLine/common/commandLineService.ts b/src/sql/workbench/services/commandLine/common/commandLineService.ts index 80a521ef89..b095ac7946 100644 --- a/src/sql/workbench/services/commandLine/common/commandLineService.ts +++ b/src/sql/workbench/services/commandLine/common/commandLineService.ts @@ -9,11 +9,11 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment'; import * as Constants from 'sql/platform/connection/common/constants'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import * as platform from 'vs/platform/registry/common/platform'; import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { ICommandService } from 'vs/platform/commands/common/commands'; diff --git a/src/sql/parts/connection/connectionDialog/connectionController.ts b/src/sql/workbench/services/connection/browser/connectionController.ts similarity index 97% rename from src/sql/parts/connection/connectionDialog/connectionController.ts rename to src/sql/workbench/services/connection/browser/connectionController.ts index 16be0873ee..3470c521df 100644 --- a/src/sql/parts/connection/connectionDialog/connectionController.ts +++ b/src/sql/workbench/services/connection/browser/connectionController.ts @@ -6,8 +6,7 @@ 'use strict'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IConnectionComponentCallbacks, IConnectionComponentController, IConnectionValidateResult } from 'sql/parts/connection/connectionDialog/connectionDialogService'; -import { ConnectionWidget } from 'sql/parts/connection/connectionDialog/connectionWidget'; +import { IConnectionComponentCallbacks, IConnectionComponentController, IConnectionValidateResult } from 'sql/workbench/services/connection/browser/connectionDialogService'; import { AdvancedPropertiesController } from 'sql/parts/connection/connectionDialog/advancedPropertiesController'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; @@ -17,6 +16,7 @@ import * as Utils from 'sql/platform/connection/common/utils'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { ConnectionWidget } from 'sql/workbench/services/connection/browser/connectionWidget'; export class ConnectionController implements IConnectionComponentController { private _container: HTMLElement; diff --git a/src/sql/parts/connection/connectionDialog/connectionDialogService.ts b/src/sql/workbench/services/connection/browser/connectionDialogService.ts similarity index 97% rename from src/sql/parts/connection/connectionDialog/connectionDialogService.ts rename to src/sql/workbench/services/connection/browser/connectionDialogService.ts index f10475ae2f..5d51b0ecc7 100644 --- a/src/sql/parts/connection/connectionDialog/connectionDialogService.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogService.ts @@ -6,11 +6,11 @@ 'use strict'; import { - IConnectionDialogService, IConnectionManagementService, + IConnectionManagementService, ConnectionType, INewConnectionParams, IConnectionCompletionOptions, IConnectionResult } from 'sql/platform/connection/common/connectionManagement'; -import { ConnectionDialogWidget, OnShowUIResponse } from 'sql/parts/connection/connectionDialog/connectionDialogWidget'; -import { ConnectionController } from 'sql/parts/connection/connectionDialog/connectionController'; +import { ConnectionDialogWidget, OnShowUIResponse } from 'sql/workbench/services/connection/browser/connectionDialogWidget'; +import { ConnectionController } from 'sql/workbench/services/connection/browser/connectionController'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import * as Constants from 'sql/platform/connection/common/constants'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -19,6 +19,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import { entries } from 'sql/base/common/objects'; import { Deferred } from 'sql/base/common/promise'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -62,7 +63,6 @@ export class ConnectionDialogService implements IConnectionDialogService { _serviceBrand: any; - private _connectionManagementService: IConnectionManagementService; private _container: HTMLElement; private _connectionDialog: ConnectionDialogWidget; private _connectionControllerMap: { [providerDisplayName: string]: IConnectionComponentController } = {}; @@ -76,6 +76,8 @@ export class ConnectionDialogService implements IConnectionDialogService { private _connectionErrorTitle = localize('connectionError', 'Connection error'); private _dialogDeferredPromise: Deferred; + private _connectionManagementService: IConnectionManagementService; + constructor( @IPartService private _partService: IPartService, @IInstantiationService private _instantiationService: IInstantiationService, @@ -297,14 +299,14 @@ export class ConnectionDialogService implements IConnectionDialogService { }); } - public openDialogAndWait(connectionManagementService: IConnectionManagementService, + public openDialogAndWait( + connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Thenable { this._dialogDeferredPromise = new Deferred(); - this.showDialog(connectionManagementService, - params, + this.showDialog(connectionManagementService, params, model, connectionResult).then(() => { }, error => { @@ -318,8 +320,8 @@ export class ConnectionDialogService implements IConnectionDialogService { params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Thenable { - this._connectionManagementService = connectionManagementService; + this._params = params; this._inputModel = model; diff --git a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts similarity index 99% rename from src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts rename to src/sql/workbench/services/connection/browser/connectionDialogWidget.ts index 96e2c2597b..b10238bb39 100644 --- a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts @@ -5,12 +5,12 @@ import 'vs/css!./media/connectionDialog'; import { Button } from 'sql/base/browser/ui/button/button'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler'; +import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import { IConnectionManagementService, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; -import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; +import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/parts/connection/connectionDialog/connectionWidget.ts b/src/sql/workbench/services/connection/browser/connectionWidget.ts similarity index 99% rename from src/sql/parts/connection/connectionDialog/connectionWidget.ts rename to src/sql/workbench/services/connection/browser/connectionWidget.ts index eea78dfa1d..30c90e3fd8 100644 --- a/src/sql/parts/connection/connectionDialog/connectionWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts @@ -11,8 +11,8 @@ import { Button } from 'sql/base/browser/ui/button/button'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; -import { IConnectionComponentCallbacks } from 'sql/parts/connection/connectionDialog/connectionDialogService'; +import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; +import { IConnectionComponentCallbacks } from 'sql/workbench/services/connection/browser/connectionDialogService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as Constants from 'sql/platform/connection/common/constants'; @@ -21,7 +21,7 @@ import { Dropdown } from 'sql/base/browser/ui/editableDropdown/dropdown'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import * as styler from 'sql/common/theme/styler'; +import * as styler from 'sql/platform/theme/common/styler'; import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import * as sqlops from 'sqlops'; diff --git a/src/sql/parts/connection/connectionDialog/media/clear-search-results-dark.svg b/src/sql/workbench/services/connection/browser/media/clear-search-results-dark.svg similarity index 100% rename from src/sql/parts/connection/connectionDialog/media/clear-search-results-dark.svg rename to src/sql/workbench/services/connection/browser/media/clear-search-results-dark.svg diff --git a/src/sql/parts/connection/connectionDialog/media/clear-search-results.svg b/src/sql/workbench/services/connection/browser/media/clear-search-results.svg similarity index 100% rename from src/sql/parts/connection/connectionDialog/media/clear-search-results.svg rename to src/sql/workbench/services/connection/browser/media/clear-search-results.svg diff --git a/src/sql/parts/connection/connectionDialog/media/connectionDialog.css b/src/sql/workbench/services/connection/browser/media/connectionDialog.css similarity index 100% rename from src/sql/parts/connection/connectionDialog/media/connectionDialog.css rename to src/sql/workbench/services/connection/browser/media/connectionDialog.css diff --git a/src/sql/parts/connection/connectionDialog/media/sqlConnection.css b/src/sql/workbench/services/connection/browser/media/sqlConnection.css similarity index 100% rename from src/sql/parts/connection/connectionDialog/media/sqlConnection.css rename to src/sql/workbench/services/connection/browser/media/sqlConnection.css diff --git a/src/sql/workbench/services/connection/common/connectionDialogService.ts b/src/sql/workbench/services/connection/common/connectionDialogService.ts new file mode 100644 index 0000000000..059a1f8711 --- /dev/null +++ b/src/sql/workbench/services/connection/common/connectionDialogService.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. + *--------------------------------------------------------------------------------------------*/ +'use strict'; + +import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; +import { INewConnectionParams, IConnectionResult, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; + +export const IConnectionDialogService = createDecorator('connectionDialogService'); +export interface IConnectionDialogService { + _serviceBrand: any; + /** + * Opens the connection dialog and returns the promise for successfully opening the dialog + * @param connectionManagementService + * @param params + * @param model + * @param connectionResult + */ + showDialog(connectionManagementService: IConnectionManagementService, params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult): Thenable; + + /** + * Opens the connection dialog and returns the promise when connection is made + * or dialog is closed + * @param connectionManagementService + * @param params + * @param model + * @param connectionResult + */ + openDialogAndWait(connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Thenable; +} + diff --git a/src/sql/parts/dashboard/newDashboardTabDialog/media/newDashboardTabDialog.css b/src/sql/workbench/services/dashboard/browser/media/newDashboardTabDialog.css similarity index 100% rename from src/sql/parts/dashboard/newDashboardTabDialog/media/newDashboardTabDialog.css rename to src/sql/workbench/services/dashboard/browser/media/newDashboardTabDialog.css diff --git a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts similarity index 94% rename from src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog.ts rename to src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts index c9ba15b2c6..1d106c3806 100644 --- a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts @@ -7,17 +7,14 @@ import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!./media/newDashboardTabDialog'; + import * as DOM from 'vs/base/browser/dom'; import { List } from 'vs/base/browser/ui/list/listWidget'; -import { IListService, ListService } from 'vs/platform/list/browser/listService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { Event, Emitter } from 'vs/base/common/event'; import { localize } from 'vs/nls'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { attachListStyler } from 'vs/platform/theme/common/styler'; -import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IVirtualDelegate, IRenderer } from 'vs/base/browser/ui/list/list'; @@ -25,10 +22,10 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler'; +import { Modal } from 'sql/workbench/browser/modal/modal'; +import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { NewDashboardTabViewModel, IDashboardUITab } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabViewModel'; +import { NewDashboardTabViewModel, IDashboardUITab } from 'sql/workbench/services/dashboard/common/newDashboardTabViewModel'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; diff --git a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts similarity index 87% rename from src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService.ts rename to src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts index 735a14b6ed..c59403a31a 100644 --- a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { INewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/interface'; -import { NewDashboardTabDialog } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog'; +import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/common/newDashboardTabDialog'; +import { NewDashboardTabDialog } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; -import { IDashboardUITab } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabViewModel'; +import { IDashboardUITab } from 'sql/workbench/services/dashboard/common/newDashboardTabViewModel'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/dashboard/newDashboardTabDialog/interface.ts b/src/sql/workbench/services/dashboard/common/newDashboardTabDialog.ts similarity index 100% rename from src/sql/parts/dashboard/newDashboardTabDialog/interface.ts rename to src/sql/workbench/services/dashboard/common/newDashboardTabDialog.ts diff --git a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabViewModel.ts b/src/sql/workbench/services/dashboard/common/newDashboardTabViewModel.ts similarity index 100% rename from src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabViewModel.ts rename to src/sql/workbench/services/dashboard/common/newDashboardTabViewModel.ts diff --git a/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts b/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts index ad6b42ffb0..c883ddd552 100644 --- a/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts +++ b/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts @@ -7,9 +7,9 @@ import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!./media/errorMessageDialog'; import { Button } from 'sql/base/browser/ui/button/button'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { attachButtonStyler, attachModalDialogStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { Builder } from 'vs/base/browser/builder'; import Severity from 'vs/base/common/severity'; diff --git a/src/sql/parts/fileBrowser/fileBrowserController.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserController.ts similarity index 100% rename from src/sql/parts/fileBrowser/fileBrowserController.ts rename to src/sql/workbench/services/fileBrowser/browser/fileBrowserController.ts diff --git a/src/sql/parts/fileBrowser/fileBrowserDataSource.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts similarity index 96% rename from src/sql/parts/fileBrowser/fileBrowserDataSource.ts rename to src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts index fb6949b3f1..19e9e47fc8 100644 --- a/src/sql/parts/fileBrowser/fileBrowserDataSource.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts @@ -6,7 +6,7 @@ 'use strict'; import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/parts/fileBrowser/fileBrowserDialog.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts similarity index 95% rename from src/sql/parts/fileBrowser/fileBrowserDialog.ts rename to src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts index c16f495a5f..4bcece91f7 100644 --- a/src/sql/parts/fileBrowser/fileBrowserDialog.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts @@ -10,13 +10,13 @@ import 'vs/css!./media/fileBrowserDialog'; import { Button } from 'sql/base/browser/ui/button/button'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; -import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler'; +import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; +import { Modal } from 'sql/workbench/browser/modal/modal'; +import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; -import { FileBrowserTreeView } from 'sql/parts/fileBrowser/fileBrowserTreeView'; -import { FileBrowserViewModel } from 'sql/parts/fileBrowser/fileBrowserViewModel'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; +import { FileBrowserTreeView } from 'sql/workbench/services/fileBrowser/browser/fileBrowserTreeView'; +import { FileBrowserViewModel } from 'sql/workbench/services/fileBrowser/common/fileBrowserViewModel'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { Builder } from 'vs/base/browser/builder'; diff --git a/src/sql/parts/fileBrowser/fileBrowserDialogController.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialogController.ts similarity index 86% rename from src/sql/parts/fileBrowser/fileBrowserDialogController.ts rename to src/sql/workbench/services/fileBrowser/browser/fileBrowserDialogController.ts index 247efd2907..6c411d62cf 100644 --- a/src/sql/parts/fileBrowser/fileBrowserDialogController.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialogController.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; -import { FileBrowserDialog } from 'sql/parts/fileBrowser/fileBrowserDialog'; +import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController'; +import { FileBrowserDialog } from 'sql/workbench/services/fileBrowser/browser/fileBrowserDialog'; import { localize } from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/fileBrowser/fileBrowserRenderer.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts similarity index 97% rename from src/sql/parts/fileBrowser/fileBrowserRenderer.ts rename to src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts index c87b9f73a4..0259b4833f 100644 --- a/src/sql/parts/fileBrowser/fileBrowserRenderer.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserRenderer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; import { FileKind } from 'vs/platform/files/common/files'; import URI from 'vs/base/common/uri'; diff --git a/src/sql/parts/fileBrowser/fileBrowserTreeView.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts similarity index 93% rename from src/sql/parts/fileBrowser/fileBrowserTreeView.ts rename to src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts index 363c53b394..e212b4cdbb 100644 --- a/src/sql/parts/fileBrowser/fileBrowserTreeView.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts @@ -3,11 +3,11 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { FileBrowserDataSource } from 'sql/parts/fileBrowser/fileBrowserDataSource'; -import { FileBrowserController } from 'sql/parts/fileBrowser/fileBrowserController'; -import { FileBrowserRenderer } from 'sql/parts/fileBrowser/fileBrowserRenderer'; +import { FileBrowserDataSource } from 'sql/workbench/services/fileBrowser/browser/fileBrowserDataSource'; +import { FileBrowserController } from 'sql/workbench/services/fileBrowser/browser/fileBrowserController'; +import { FileBrowserRenderer } from 'sql/workbench/services/fileBrowser/browser/fileBrowserRenderer'; import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import errors = require('vs/base/common/errors'); import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import * as DOM from 'vs/base/browser/dom'; diff --git a/src/sql/parts/fileBrowser/media/fileBrowserDialog.css b/src/sql/workbench/services/fileBrowser/browser/media/fileBrowserDialog.css similarity index 100% rename from src/sql/parts/fileBrowser/media/fileBrowserDialog.css rename to src/sql/workbench/services/fileBrowser/browser/media/fileBrowserDialog.css diff --git a/src/sql/workbench/services/fileBrowser/common/fileBrowserDialogController.ts b/src/sql/workbench/services/fileBrowser/common/fileBrowserDialogController.ts new file mode 100644 index 0000000000..daac3db29d --- /dev/null +++ b/src/sql/workbench/services/fileBrowser/common/fileBrowserDialogController.ts @@ -0,0 +1,22 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; + +export const IFileBrowserDialogController = createDecorator('fileBrowserDialogService'); +export interface IFileBrowserDialogController { + _serviceBrand: any; + /** + * Show file browser dialog + */ + showDialog(ownerUri: string, + expandPath: string, + fileFilters: { label: string, filters: string[] }[], + fileValidationServiceType: string, + isWide: boolean, + handleOnOk: (path: string) => void): void; +} diff --git a/src/sql/parts/fileBrowser/common/fileBrowserTree.ts b/src/sql/workbench/services/fileBrowser/common/fileBrowserTree.ts similarity index 87% rename from src/sql/parts/fileBrowser/common/fileBrowserTree.ts rename to src/sql/workbench/services/fileBrowser/common/fileBrowserTree.ts index 358138635a..0ed0d3a726 100644 --- a/src/sql/parts/fileBrowser/common/fileBrowserTree.ts +++ b/src/sql/workbench/services/fileBrowser/common/fileBrowserTree.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; +import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; /** * File tree info needed to render initially diff --git a/src/sql/parts/fileBrowser/fileBrowserViewModel.ts b/src/sql/workbench/services/fileBrowser/common/fileBrowserViewModel.ts similarity index 100% rename from src/sql/parts/fileBrowser/fileBrowserViewModel.ts rename to src/sql/workbench/services/fileBrowser/common/fileBrowserViewModel.ts diff --git a/src/sql/parts/fileBrowser/common/fileNode.ts b/src/sql/workbench/services/fileBrowser/common/fileNode.ts similarity index 74% rename from src/sql/parts/fileBrowser/common/fileNode.ts rename to src/sql/workbench/services/fileBrowser/common/fileNode.ts index fe1a3f79ff..1bb1490eb1 100644 --- a/src/sql/parts/fileBrowser/common/fileNode.ts +++ b/src/sql/workbench/services/fileBrowser/common/fileNode.ts @@ -11,51 +11,51 @@ import { generateUuid } from 'vs/base/common/uuid'; */ export class FileNode { /** - * Node id - */ + * Node id + */ public id: string; /** - * Connection uri - */ + * Connection uri + */ public ownerUri: string; /** - * File or folder name - */ + * File or folder name + */ public name: string; /** - * Full path of file or folder - */ + * Full path of file or folder + */ public fullPath: string; /** - * Parent node - */ + * Parent node + */ public parent: FileNode; /** - * Children nodes - */ + * Children nodes + */ public children: FileNode[]; /** - * Is the node expanded - */ + * Is the node expanded + */ public isExpanded: boolean; /** - * Is the node file or folder - */ + * Is the node file or folder + */ public isFile: boolean; /** - * Does this node have children - */ + * Does this node have children + */ public hasChildren: boolean; - constructor(id: string, name: string, fullPath: string, isFile: boolean, isExpanded: boolean, ownerUri: string, parent:FileNode) { + constructor(id: string, name: string, fullPath: string, isFile: boolean, isExpanded: boolean, ownerUri: string, parent: FileNode) { if (id) { this.id = id; } else { diff --git a/src/sql/parts/fileBrowser/common/fileValidationServiceConstants.ts b/src/sql/workbench/services/fileBrowser/common/fileValidationServiceConstants.ts similarity index 100% rename from src/sql/parts/fileBrowser/common/fileValidationServiceConstants.ts rename to src/sql/workbench/services/fileBrowser/common/fileValidationServiceConstants.ts diff --git a/src/sql/parts/insights/insightsDialogService.ts b/src/sql/workbench/services/insights/browser/insightsDialogService.ts similarity index 83% rename from src/sql/parts/insights/insightsDialogService.ts rename to src/sql/workbench/services/insights/browser/insightsDialogService.ts index 21e1edb140..aac11b3069 100644 --- a/src/sql/parts/insights/insightsDialogService.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogService.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { InsightsDialogController } from 'sql/parts/insights/node/insightsDialogController'; -import { InsightsDialogView } from 'sql/parts/insights/browser/insightsDialogView'; +import { InsightsDialogController } from 'sql/workbench/services/insights/node/insightsDialogController'; +import { InsightsDialogView } from 'sql/workbench/services/insights/browser/insightsDialogView'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { IInsightsDialogModel, IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; -import { InsightsDialogModel } from 'sql/parts/insights/common/insightsDialogModel'; +import { IInsightsDialogModel, IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; +import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel'; export class InsightsDialogService implements IInsightsDialogService { _serviceBrand: any; diff --git a/src/sql/parts/insights/browser/insightsDialogView.ts b/src/sql/workbench/services/insights/browser/insightsDialogView.ts similarity index 97% rename from src/sql/parts/insights/browser/insightsDialogView.ts rename to src/sql/workbench/services/insights/browser/insightsDialogView.ts index beb64b5000..dde57af8ff 100644 --- a/src/sql/parts/insights/browser/insightsDialogView.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogView.ts @@ -2,22 +2,22 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/parts/insights/browser/media/insightsDialog'; +import 'vs/css!./media/insightsDialog'; import { Button } from 'sql/base/browser/ui/button/button'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { Modal } from 'sql/base/browser/ui/modal/modal'; +import { Modal } from 'sql/workbench/browser/modal/modal'; import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachPanelStyler } from 'sql/common/theme/styler'; +import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; import { TaskRegistry } from 'sql/platform/tasks/common/tasks'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { IInsightsDialogModel, ListResource, IInsightDialogActionContext, insertValueRegex } from 'sql/parts/insights/common/interfaces'; +import { IInsightsDialogModel, ListResource, IInsightDialogActionContext, insertValueRegex } from 'sql/workbench/services/insights/common/insightsDialogService'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin'; import { error } from 'sql/base/common/log'; import { Table } from 'sql/base/browser/ui/table/table'; -import { CopyInsightDialogSelectionAction } from 'sql/parts/insights/common/insightDialogActions'; +import { CopyInsightDialogSelectionAction } from 'sql/workbench/services/insights/common/insightDialogActions'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { IDisposableDataProvider } from 'sql/base/browser/ui/table/interfaces'; diff --git a/src/sql/parts/insights/browser/media/insightsDialog.css b/src/sql/workbench/services/insights/browser/media/insightsDialog.css similarity index 100% rename from src/sql/parts/insights/browser/media/insightsDialog.css rename to src/sql/workbench/services/insights/browser/media/insightsDialog.css diff --git a/src/sql/parts/insights/common/insightDialogActions.ts b/src/sql/workbench/services/insights/common/insightDialogActions.ts similarity index 90% rename from src/sql/parts/insights/common/insightDialogActions.ts rename to src/sql/workbench/services/insights/common/insightDialogActions.ts index 13287c23dc..bc5707c274 100644 --- a/src/sql/parts/insights/common/insightDialogActions.ts +++ b/src/sql/workbench/services/insights/common/insightDialogActions.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IInsightDialogActionContext } from 'sql/parts/insights/common/interfaces'; +import { IInsightDialogActionContext } from 'sql/workbench/services/insights/common/insightsDialogService'; import { Action } from 'vs/base/common/actions'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/insights/common/insightsDialogModel.ts b/src/sql/workbench/services/insights/common/insightsDialogModel.ts similarity index 97% rename from src/sql/parts/insights/common/insightsDialogModel.ts rename to src/sql/workbench/services/insights/common/insightsDialogModel.ts index 491f6790b6..73dcc2bb97 100644 --- a/src/sql/parts/insights/common/insightsDialogModel.ts +++ b/src/sql/workbench/services/insights/common/insightsDialogModel.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IInsightsDialogModel, ListResource } from './interfaces'; +import { IInsightsDialogModel, ListResource } from 'sql/workbench/services/insights/common/insightsDialogService'; import { IInsightsConfigDetails, IInsightsLabel } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { Conditional } from 'sql/parts/dashboard/common/interfaces'; diff --git a/src/sql/parts/insights/common/interfaces.ts b/src/sql/workbench/services/insights/common/insightsDialogService.ts similarity index 100% rename from src/sql/parts/insights/common/interfaces.ts rename to src/sql/workbench/services/insights/common/insightsDialogService.ts diff --git a/src/sql/parts/insights/node/insightsDialogController.ts b/src/sql/workbench/services/insights/node/insightsDialogController.ts similarity index 98% rename from src/sql/parts/insights/node/insightsDialogController.ts rename to src/sql/workbench/services/insights/node/insightsDialogController.ts index 37b6d48d24..4d96ed52a1 100644 --- a/src/sql/parts/insights/node/insightsDialogController.ts +++ b/src/sql/workbench/services/insights/node/insightsDialogController.ts @@ -8,7 +8,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; import QueryRunner, { EventType as QREvents } from 'sql/platform/query/common/queryRunner'; import * as Utils from 'sql/platform/connection/common/utils'; -import { IInsightsDialogModel, insertValueRegex } from 'sql/parts/insights/common/interfaces'; +import { IInsightsDialogModel, insertValueRegex } from 'sql/workbench/services/insights/common/insightsDialogService'; import { error } from 'sql/base/common/log'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/parts/objectExplorer/common/objectExplorerService.ts b/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts similarity index 100% rename from src/sql/parts/objectExplorer/common/objectExplorerService.ts rename to src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts diff --git a/src/sql/parts/query/services/queryEditorService.ts b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts similarity index 97% rename from src/sql/parts/query/services/queryEditorService.ts rename to src/sql/workbench/services/queryEditor/browser/queryEditorService.ts index 8f2590933d..2a578a986b 100644 --- a/src/sql/parts/query/services/queryEditorService.ts +++ b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts @@ -8,7 +8,7 @@ import { QueryInput } from 'sql/parts/query/common/queryInput'; import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; -import { IQueryEditorService, IQueryEditorOptions } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/parts/common/customInputConverter'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; @@ -53,21 +53,18 @@ export class QueryEditorService implements IQueryEditorService { // service references for static functions private static editorService: IEditorService; private static instantiationService: IInstantiationService; - private static editorGroupService: IEditorGroupsService; private static notificationService: INotificationService; constructor( + @INotificationService _notificationService: INotificationService, @IUntitledEditorService private _untitledEditorService: IUntitledEditorService, @IInstantiationService private _instantiationService: IInstantiationService, @IEditorService private _editorService: IEditorService, - @IEditorGroupsService private _editorGroupService: IEditorGroupsService, - @INotificationService private _notificationService: INotificationService, @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, @IConfigurationService private _configurationService: IConfigurationService ) { QueryEditorService.editorService = _editorService; QueryEditorService.instantiationService = _instantiationService; - QueryEditorService.editorGroupService = _editorGroupService; QueryEditorService.notificationService = _notificationService; } diff --git a/src/sql/parts/query/editor/editorDescriptorService.ts b/src/sql/workbench/services/queryEditor/common/editorDescriptorService.ts similarity index 91% rename from src/sql/parts/query/editor/editorDescriptorService.ts rename to src/sql/workbench/services/queryEditor/common/editorDescriptorService.ts index 0388a7ba21..e6da4f758b 100644 --- a/src/sql/parts/query/editor/editorDescriptorService.ts +++ b/src/sql/workbench/services/queryEditor/common/editorDescriptorService.ts @@ -28,4 +28,4 @@ export class EditorDescriptorService implements IEditorDescriptorService { export const SERVICE_ID = 'editorDescriptorService'; -export const IEditorDescriptorService = createDecorator(SERVICE_ID); \ No newline at end of file +export const IEditorDescriptorService = createDecorator(SERVICE_ID); \ No newline at end of file diff --git a/src/sql/parts/query/common/queryEditorService.ts b/src/sql/workbench/services/queryEditor/common/queryEditorService.ts similarity index 91% rename from src/sql/parts/query/common/queryEditorService.ts rename to src/sql/workbench/services/queryEditor/common/queryEditorService.ts index 16dad0ebfc..a226a9628b 100644 --- a/src/sql/parts/query/common/queryEditorService.ts +++ b/src/sql/workbench/services/queryEditor/common/queryEditorService.ts @@ -6,7 +6,6 @@ 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 { QueryEditorService } from 'sql/parts/query/services/queryEditorService'; import URI from 'vs/base/common/uri'; @@ -17,7 +16,7 @@ export interface IQueryEditorOptions extends IEditorOptions { denyQueryEditor?: boolean; } -export const IQueryEditorService = createDecorator('QueryEditorService'); +export const IQueryEditorService = createDecorator('QueryEditorService'); export interface IQueryEditorService { diff --git a/src/sql/platform/telemetry/fileTelemetryService.ts b/src/sql/workbench/services/telemetry/node/fileTelemetryService.ts similarity index 100% rename from src/sql/platform/telemetry/fileTelemetryService.ts rename to src/sql/workbench/services/telemetry/node/fileTelemetryService.ts diff --git a/src/sqltest/parts/commandLine/commandLineService.test.ts b/src/sqltest/parts/commandLine/commandLineService.test.ts index fe9d74c036..257cf05366 100644 --- a/src/sqltest/parts/commandLine/commandLineService.test.ts +++ b/src/sqltest/parts/commandLine/commandLineService.test.ts @@ -16,9 +16,9 @@ import { EnvironmentService } from 'vs/platform/environment/node/environmentServ import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; -import { QueryEditorService } from 'sql/parts/query/services/queryEditorService'; +import { QueryEditorService } from 'sql/workbench/services/queryEditor/browser/queryEditorService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { ObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { ObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; diff --git a/src/sqltest/parts/common/optionsDialogHelper.test.ts b/src/sqltest/parts/common/optionsDialogHelper.test.ts index 7fdc54e6bb..a259a96f8d 100644 --- a/src/sqltest/parts/common/optionsDialogHelper.test.ts +++ b/src/sqltest/parts/common/optionsDialogHelper.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as OptionsDialogHelper from 'sql/base/browser/ui/modal/optionsDialogHelper'; +import * as OptionsDialogHelper from 'sql/workbench/browser/modal/optionsDialogHelper'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import * as sqlops from 'sqlops'; import { Builder, $ } from 'vs/base/browser/builder'; diff --git a/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts b/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts index c048936078..dfa9575978 100644 --- a/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts +++ b/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog'; +import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { AdvancedPropertiesController } from 'sql/parts/connection/connectionDialog/advancedPropertiesController'; import { Builder, $ } from 'vs/base/browser/builder'; import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub'; diff --git a/src/sqltest/parts/connection/connectionDialogService.test.ts b/src/sqltest/parts/connection/connectionDialogService.test.ts index 3314557a69..f39b2ab16e 100644 --- a/src/sqltest/parts/connection/connectionDialogService.test.ts +++ b/src/sqltest/parts/connection/connectionDialogService.test.ts @@ -5,8 +5,8 @@ 'use strict'; -import { ConnectionDialogService } from 'sql/parts/connection/connectionDialog/connectionDialogService'; -import { ConnectionDialogWidget } from 'sql/parts/connection/connectionDialog/connectionDialogWidget'; +import { ConnectionDialogService } from 'sql/workbench/services/connection/browser/connectionDialogService'; +import { ConnectionDialogWidget } from 'sql/workbench/services/connection/browser/connectionDialogWidget'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { ConnectionType, IConnectableInput, IConnectionResult, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub'; diff --git a/src/sqltest/parts/connection/connectionManagementService.test.ts b/src/sqltest/parts/connection/connectionManagementService.test.ts index 92ad618097..9e30083277 100644 --- a/src/sqltest/parts/connection/connectionManagementService.test.ts +++ b/src/sqltest/parts/connection/connectionManagementService.test.ts @@ -149,14 +149,12 @@ suite('SQL ConnectionManagementService tests', () => { let connectionManagementService = new ConnectionManagementService( undefined, connectionStore.object, + undefined, connectionDialogService.object, undefined, undefined, - undefined, workbenchEditorService.object, undefined, - undefined, - undefined, workspaceConfigurationServiceMock.object, undefined, capabilitiesService, @@ -165,7 +163,6 @@ suite('SQL ConnectionManagementService tests', () => { undefined, resourceProviderStubMock.object, undefined, - undefined, accountManagementService.object ); return connectionManagementService; diff --git a/src/sqltest/parts/connection/connectionTreeActions.test.ts b/src/sqltest/parts/connection/connectionTreeActions.test.ts index 202b9dfb66..12561e5915 100644 --- a/src/sqltest/parts/connection/connectionTreeActions.test.ts +++ b/src/sqltest/parts/connection/connectionTreeActions.test.ts @@ -21,7 +21,7 @@ import { InstantiationService } from 'vs/platform/instantiation/common/instantia import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import * as Constants from 'sql/platform/connection/common/constants'; import * as LocalizedConstants from 'sql/parts/connection/common/localizedConstants'; -import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; diff --git a/src/sqltest/parts/connection/objectExplorerService.test.ts b/src/sqltest/parts/connection/objectExplorerService.test.ts index 9067a9c529..2c4c829a35 100644 --- a/src/sqltest/parts/connection/objectExplorerService.test.ts +++ b/src/sqltest/parts/connection/objectExplorerService.test.ts @@ -8,9 +8,9 @@ import { ObjectExplorerProviderTestService } from 'sqltest/stubs/objectExplorerP import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; -import { ObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { ObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; -import { TreeNode, TreeItemCollapsibleState, ObjectExplorerCallbacks } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; import { TPromise } from 'vs/base/common/winjs.base'; import * as sqlops from 'sqlops'; @@ -19,7 +19,6 @@ import * as assert from 'assert'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { Event, Emitter } from 'vs/base/common/event'; -import { CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; suite('SQL Object Explorer Service tests', () => { diff --git a/src/sqltest/parts/insights/insightsDialogController.test.ts b/src/sqltest/parts/insights/insightsDialogController.test.ts index 74e7825772..38bf5229a9 100644 --- a/src/sqltest/parts/insights/insightsDialogController.test.ts +++ b/src/sqltest/parts/insights/insightsDialogController.test.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { InsightsDialogController } from 'sql/parts/insights/node/insightsDialogController'; -import { InsightsDialogModel } from 'sql/parts/insights/common/insightsDialogModel'; +import { InsightsDialogController } from 'sql/workbench/services/insights/node/insightsDialogController'; +import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel'; import QueryRunner, { EventType } from 'sql/platform/query/common/queryRunner'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; diff --git a/src/sqltest/parts/insights/insightsDialogModel.test.ts b/src/sqltest/parts/insights/insightsDialogModel.test.ts index c3230710c1..92cdef91b6 100644 --- a/src/sqltest/parts/insights/insightsDialogModel.test.ts +++ b/src/sqltest/parts/insights/insightsDialogModel.test.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { IInsightsLabel, IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { InsightsDialogModel } from 'sql/parts/insights/common/insightsDialogModel'; +import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel'; import { isUndefinedOrNull } from 'vs/base/common/types'; import * as assert from 'assert'; diff --git a/src/sqltest/parts/query/editor/queryActions.test.ts b/src/sqltest/parts/query/editor/queryActions.test.ts index d87d09202f..8b7d6b1bce 100644 --- a/src/sqltest/parts/query/editor/queryActions.test.ts +++ b/src/sqltest/parts/query/editor/queryActions.test.ts @@ -16,7 +16,7 @@ import { ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; -import { ConnectionDialogService } from 'sql/parts/connection/connectionDialog/connectionDialogService'; +import { ConnectionDialogService } from 'sql/workbench/services/connection/browser/connectionDialogService'; import { RunQueryAction, CancelQueryAction, ListDatabasesActionItem, DisconnectDatabaseAction, ConnectDatabaseAction, QueryTaskbarAction @@ -122,7 +122,7 @@ suite('SQL QueryAction Tests', () => { .returns(() => TPromise.as(none)); // ... Mock "isConnected" in ConnectionManagementService - let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, connectionDialogService.object); + let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, undefined, connectionDialogService.object); connectionManagementService.callBase = true; connectionManagementService.setup(x => x.isConnected(TypeMoq.It.isAnyString())).returns(() => isConnected); @@ -245,7 +245,7 @@ suite('SQL QueryAction Tests', () => { }); // ... Mock "isConnected" in ConnectionManagementService - let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, connectionDialogService.object); + let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, undefined, connectionDialogService.object); connectionManagementService.callBase = true; connectionManagementService.setup(x => x.isConnected(TypeMoq.It.isAnyString())).returns(() => isConnected); @@ -383,7 +383,7 @@ suite('SQL QueryAction Tests', () => { .returns(() => TPromise.as(none)); // ... Mock "isConnected" in ConnectionManagementService - let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, connectionDialogService.object); + let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, undefined, connectionDialogService.object); connectionManagementService.callBase = true; connectionManagementService.setup(x => x.isConnected(TypeMoq.It.isAnyString())).returns(() => isConnected); @@ -429,7 +429,7 @@ suite('SQL QueryAction Tests', () => { .returns(() => TPromise.as(none)); // ... Mock "isConnected" in ConnectionManagementService - let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, connectionDialogService.object); + let connectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, {}, {}, undefined, connectionDialogService.object); connectionManagementService.callBase = true; connectionManagementService.setup(x => x.isConnected(TypeMoq.It.isAnyString())).returns(() => isConnected); diff --git a/src/sqltest/parts/query/editor/queryEditor.test.ts b/src/sqltest/parts/query/editor/queryEditor.test.ts index 75b0f88d36..dbcce6d17f 100644 --- a/src/sqltest/parts/query/editor/queryEditor.test.ts +++ b/src/sqltest/parts/query/editor/queryEditor.test.ts @@ -21,7 +21,7 @@ import { QueryInput } from 'sql/parts/query/common/queryInput'; import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { RunQueryAction, ListDatabasesActionItem } from 'sql/parts/query/execution/queryActions'; -import { EditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; +import { EditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService'; import { TestThemeService } from 'sqltest/stubs/themeTestService'; diff --git a/src/sqltest/stubs/connectionDialogTestService.ts b/src/sqltest/stubs/connectionDialogTestService.ts index 4e59cdd52d..32576b500f 100644 --- a/src/sqltest/stubs/connectionDialogTestService.ts +++ b/src/sqltest/stubs/connectionDialogTestService.ts @@ -4,22 +4,23 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { - IConnectionDialogService, IConnectionManagementService, INewConnectionParams, IConnectionResult -} from 'sql/platform/connection/common/connectionManagement'; +import { INewConnectionParams, IConnectionResult, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { TPromise } from 'vs/base/common/winjs.base'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; export class ConnectionDialogTestService implements IConnectionDialogService { _serviceBrand: any; - public showDialog(connectionManagementService: IConnectionManagementService, + public showDialog( + connectionManagementService: IConnectionManagementService, params: INewConnectionParams, model: IConnectionProfile, connectionResult?: IConnectionResult): TPromise { let none: void; return TPromise.as(none); } - public openDialogAndWait(connectionManagementService: IConnectionManagementService, + public openDialogAndWait( + connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): TPromise { return TPromise.as(undefined); } diff --git a/src/sqltest/workbench/common/taskUtilities.test.ts b/src/sqltest/workbench/common/taskUtilities.test.ts index 420bbb4a99..91a4db5e4f 100644 --- a/src/sqltest/workbench/common/taskUtilities.test.ts +++ b/src/sqltest/workbench/common/taskUtilities.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index 18f5de3ba1..0a85417092 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -72,7 +72,7 @@ class SideBySideEditorEncodingSupport implements IEncodingSupport { } // {{SQL CARBON EDIT}} -import { QueryEditorService } from 'sql/parts/query/services/queryEditorService'; +import { QueryEditorService } from 'sql/workbench/services/queryEditor/browser/queryEditorService'; function toEditorWithEncodingSupport(input: IEditorInput): IEncodingSupport { diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index f8b07d22bb..58264077a7 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -49,8 +49,8 @@ import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; // {{SQL CARBON EDIT}} -- Display the editor's tab color import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { GlobalNewUntitledFileAction } from 'vs/workbench/parts/files/electron-browser/fileActions'; diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 4bdd3a16ef..82f5df58d5 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -100,7 +100,7 @@ import { MulitExtensionManagementService } from 'vs/platform/extensionManagement import { ExtensionManagementServerService } from 'vs/workbench/services/extensions/node/extensionManagementServerService'; // {{SQL CARBON EDIT}} -import { FileTelemetryService } from 'sql/platform/telemetry/fileTelemetryService'; +import { FileTelemetryService } from 'sql/workbench/services/telemetry/node/fileTelemetryService'; /** * Services that we require for the Shell @@ -386,7 +386,7 @@ export class WorkbenchShell extends Disposable { if (this.environmentService.args['perf-test']) { let telemetryOutput = this.environmentService.args['telemetry-output']; this.telemetryService = new FileTelemetryService(telemetryOutput); - // Telemetry + // Telemetry } else if (this.environmentService.isBuilt && !this.environmentService.isExtensionDevelopment && !this.environmentService.args['disable-telemetry'] && !!product.enableTelemetry) { const channel = getDelayedChannel(sharedProcess.then(c => c.getChannel('telemetryAppender'))); const config: ITelemetryServiceConfig = { @@ -516,7 +516,7 @@ export class WorkbenchShell extends Disposable { // {{SQL CARBON EDIT}} private diffInDays(nowDate: number, lastUseDate: number): number { - return (nowDate - lastUseDate)/(24*3600*1000); + return (nowDate - lastUseDate) / (24 * 3600 * 1000); } onUnexpectedError(error: any): void { diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 36bcb215fa..41ff478731 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -114,9 +114,10 @@ import { EditorService } from 'vs/workbench/services/editor/browser/editorServic import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler'; // {{SQL CARBON EDIT}} -import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; -import { ConnectionDialogService } from 'sql/parts/connection/connectionDialog/connectionDialogService'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; +import { ConnectionDialogService } from 'sql/workbench/services/connection/browser/connectionDialogService'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { ErrorMessageService } from 'sql/workbench/services/errorMessage/browser/errorMessageService'; import { ServerGroupController } from 'sql/workbench/services/serverGroup/browser/serverGroupController'; @@ -127,31 +128,33 @@ import { ICapabilitiesService, CapabilitiesService } from 'sql/platform/capabili import { ICredentialsService, CredentialsService } from 'sql/platform/credentials/common/credentialsService'; import { ISerializationService, SerializationService } from 'sql/platform/serialization/common/serializationService'; import { IMetadataService, MetadataService } from 'sql/platform/metadata/common/metadataService'; -import { IObjectExplorerService, ObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService, ObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { ITaskService, TaskService } from 'sql/platform/taskHistory/common/taskService'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { QueryModelService } from 'sql/platform/query/common/queryModelService'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { QueryEditorService } from 'sql/parts/query/services/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; +import { QueryEditorService } from 'sql/workbench/services/queryEditor/browser/queryEditorService'; import { IQueryManagementService, QueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { IEditorDescriptorService, EditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; +import { IEditorDescriptorService, EditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService'; import { IScriptingService, ScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IAdminService, AdminService } from 'sql/workbench/services/admin/common/adminService'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; import { IDacFxService, DacFxService } from 'sql/platform/dacfx/common/dacFxService'; -import { IBackupService, IBackupUiService } from 'sql/platform/backup/common/backupService'; +import { IBackupService } from 'sql/platform/backup/common/backupService'; import { BackupService } from 'sql/platform/backup/common/backupServiceImp'; -import { BackupUiService } from 'sql/workbench/parts/backup/browser/backupUiService'; +import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; +import { BackupUiService } from 'sql/workbench/services/backup/browser/backupUiService'; import { IRestoreDialogController, IRestoreService } from 'sql/platform/restore/common/restoreService'; import { RestoreService, RestoreDialogController } from 'sql/platform/restore/common/restoreServiceImpl'; -import { INewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/interface'; -import { NewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService'; -import { IFileBrowserService, IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; +import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/common/newDashboardTabDialog'; +import { NewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialogService'; +import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import { FileBrowserService } from 'sql/platform/fileBrowser/common/fileBrowserService'; -import { FileBrowserDialogController } from 'sql/parts/fileBrowser/fileBrowserDialogController'; -import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; -import { InsightsDialogService } from 'sql/parts/insights/insightsDialogService'; +import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController'; +import { FileBrowserDialogController } from 'sql/workbench/services/fileBrowser/browser/fileBrowserDialogController'; +import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; +import { InsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; @@ -586,9 +589,7 @@ export class Workbench extends Disposable implements IPartService { serviceCollection.set(INotebookService, notebookService); serviceCollection.set(IAccountPickerService, this.instantiationService.createInstance(AccountPickerService)); serviceCollection.set(IProfilerService, this.instantiationService.createInstance(ProfilerService)); - // {{SQL CARBON EDIT}} serviceCollection.set(ICommandLineProcessing, this.instantiationService.createInstance(CommandLineService)); - // {{SQL CARBON EDIT}} serviceCollection.set(IDacFxService, this.instantiationService.createInstance(DacFxService)); this._register(toDisposable(() => connectionManagementService.shutdown())); diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index 152eefd6c3..6a2690640b 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -54,8 +54,8 @@ import { CLOSE_EDITORS_AND_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/e // {{SQL CARBON EDIT}} import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; export interface IEditableData { diff --git a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts index 7028a9aacd..25baed09f5 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileCommands.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileCommands.ts @@ -46,7 +46,7 @@ import { isEqual, basenameOrAuthority } from 'vs/base/common/resources'; import { ltrim } from 'vs/base/common/strings'; // {{SQL CARBON EDIT}} -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; // Commands