diff --git a/src/sql/workbench/parts/grid/media/saveCsv.svg b/src/sql/base/browser/ui/table/media/saveCsv.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveCsv.svg rename to src/sql/base/browser/ui/table/media/saveCsv.svg diff --git a/src/sql/workbench/parts/grid/media/saveCsv_inverse.svg b/src/sql/base/browser/ui/table/media/saveCsv_inverse.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveCsv_inverse.svg rename to src/sql/base/browser/ui/table/media/saveCsv_inverse.svg diff --git a/src/sql/workbench/parts/grid/media/saveExcel.svg b/src/sql/base/browser/ui/table/media/saveExcel.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveExcel.svg rename to src/sql/base/browser/ui/table/media/saveExcel.svg diff --git a/src/sql/workbench/parts/grid/media/saveExcel_inverse.svg b/src/sql/base/browser/ui/table/media/saveExcel_inverse.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveExcel_inverse.svg rename to src/sql/base/browser/ui/table/media/saveExcel_inverse.svg diff --git a/src/sql/workbench/parts/grid/media/saveJson.svg b/src/sql/base/browser/ui/table/media/saveJson.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveJson.svg rename to src/sql/base/browser/ui/table/media/saveJson.svg diff --git a/src/sql/workbench/parts/grid/media/saveJson_inverse.svg b/src/sql/base/browser/ui/table/media/saveJson_inverse.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveJson_inverse.svg rename to src/sql/base/browser/ui/table/media/saveJson_inverse.svg diff --git a/src/sql/workbench/parts/grid/media/saveXml.svg b/src/sql/base/browser/ui/table/media/saveXml.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveXml.svg rename to src/sql/base/browser/ui/table/media/saveXml.svg diff --git a/src/sql/workbench/parts/grid/media/saveXml_inverse.svg b/src/sql/base/browser/ui/table/media/saveXml_inverse.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/saveXml_inverse.svg rename to src/sql/base/browser/ui/table/media/saveXml_inverse.svg diff --git a/src/sql/workbench/parts/grid/media/viewChart.svg b/src/sql/base/browser/ui/table/media/viewChart.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/viewChart.svg rename to src/sql/base/browser/ui/table/media/viewChart.svg diff --git a/src/sql/workbench/parts/grid/media/viewChart_inverse.svg b/src/sql/base/browser/ui/table/media/viewChart_inverse.svg similarity index 100% rename from src/sql/workbench/parts/grid/media/viewChart_inverse.svg rename to src/sql/base/browser/ui/table/media/viewChart_inverse.svg diff --git a/src/sql/parts/common/customInputConverter.ts b/src/sql/parts/common/customInputConverter.ts index 087fc343c7..27561b179f 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/workbench/services/queryEditor/common/queryEditorService'; -import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; +import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput'; import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput'; diff --git a/src/sql/parts/objectExplorer/viewlet/templateData.ts b/src/sql/parts/objectExplorer/viewlet/templateData.ts deleted file mode 100644 index a9c83d6719..0000000000 --- a/src/sql/parts/objectExplorer/viewlet/templateData.ts +++ /dev/null @@ -1,27 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; - -export interface IConnectionTemplateData { - root: HTMLElement; - label: HTMLSpanElement; - icon: HTMLElement; - connectionProfile: ConnectionProfile; -} - -export interface IConnectionProfileGroupTemplateData { - root: HTMLElement; - name: HTMLSpanElement; - inputBox: InputBox; -} - -export interface IObjectExplorerTemplateData { - root: HTMLElement; - label: HTMLSpanElement; - icon: HTMLElement; - treeNode: TreeNode; -} \ No newline at end of file diff --git a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts b/src/sql/parts/profiler/contrib/profilerActions.contribution.ts index 1727caa900..687bc0b187 100644 --- a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts +++ b/src/sql/parts/profiler/contrib/profilerActions.contribution.ts @@ -14,7 +14,7 @@ import { IProfilerService } from 'sql/workbench/services/profiler/common/interfa import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { KeyCode, KeyMod } from 'vs/editor/editor.api'; import { ProfilerEditor } from '../editor/profilerEditor'; -import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; +import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; diff --git a/src/sql/parts/query/common/query.contribution.ts b/src/sql/parts/query/common/query.contribution.ts index 337cf00d1b..9c494927c2 100644 --- a/src/sql/parts/query/common/query.contribution.ts +++ b/src/sql/parts/query/common/query.contribution.ts @@ -29,8 +29,8 @@ import { } from 'sql/parts/query/execution/keyboardQueryActions'; import * as gridActions from 'sql/workbench/parts/grid/views/gridActions'; import * as gridCommands from 'sql/workbench/parts/grid/views/gridCommands'; -import { QueryPlanEditor } from 'sql/parts/queryPlan/queryPlanEditor'; -import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; +import { QueryPlanEditor } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor'; +import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; import * as Constants from 'sql/parts/query/common/constants'; import { localize } from 'vs/nls'; import { EditDataResultsEditor } from 'sql/parts/editData/editor/editDataResultsEditor'; diff --git a/src/sql/parts/query/common/queryResultsInput.ts b/src/sql/parts/query/common/queryResultsInput.ts index 3608c5e5e3..a2868cad0a 100644 --- a/src/sql/parts/query/common/queryResultsInput.ts +++ b/src/sql/parts/query/common/queryResultsInput.ts @@ -12,9 +12,9 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { GridPanelState } from 'sql/parts/query/editor/gridPanel'; import { MessagePanelState } from 'sql/parts/query/editor/messagePanel'; -import { QueryPlanState } from 'sql/parts/queryPlan/queryPlan'; +import { QueryPlanState } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan'; import { ChartState } from 'sql/parts/query/editor/charting/chartView'; -import { TopOperationsState } from 'sql/parts/queryPlan/topOperations'; +import { TopOperationsState } from 'sql/workbench/parts/queryPlan/browser/topOperations'; export class ResultsViewState { public gridPanelState: GridPanelState = new GridPanelState(); diff --git a/src/sql/parts/query/editor/messagePanel.ts b/src/sql/parts/query/editor/messagePanel.ts index 7e4ce67e2c..d44e463b2e 100644 --- a/src/sql/parts/query/editor/messagePanel.ts +++ b/src/sql/parts/query/editor/messagePanel.ts @@ -7,7 +7,7 @@ import 'vs/css!./media/messagePanel'; import { IMessagesActionContext, CopyMessagesAction, CopyAllMessagesAction } from './actions'; import QueryRunner from 'sql/platform/query/common/queryRunner'; import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { IResultMessage, ISelectionData } from 'azdata'; diff --git a/src/sql/parts/query/editor/queryResultsView.ts b/src/sql/parts/query/editor/queryResultsView.ts index ee3851f3fd..230c58764d 100644 --- a/src/sql/parts/query/editor/queryResultsView.ts +++ b/src/sql/parts/query/editor/queryResultsView.ts @@ -11,8 +11,8 @@ import QueryRunner from 'sql/platform/query/common/queryRunner'; import { MessagePanel } from './messagePanel'; import { GridPanel } from './gridPanel'; import { ChartTab } from './charting/chartTab'; -import { QueryPlanTab } from 'sql/parts/queryPlan/queryPlan'; -import { TopOperationsTab } from 'sql/parts/queryPlan/topOperations'; +import { QueryPlanTab } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan'; +import { TopOperationsTab } from 'sql/workbench/parts/queryPlan/browser/topOperations'; import { QueryModelViewTab } from 'sql/parts/query/modelViewTab/queryModelViewTab'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/taskHistory/viewlet/templateData.ts b/src/sql/parts/taskHistory/viewlet/templateData.ts deleted file mode 100644 index c2ee9f6c96..0000000000 --- a/src/sql/parts/taskHistory/viewlet/templateData.ts +++ /dev/null @@ -1,11 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -export interface ITaskHistoryTemplateData { - root: HTMLElement; - icon: HTMLElement; - title: HTMLSpanElement; - description: HTMLSpanElement; - time: HTMLSpanElement; -} diff --git a/src/sql/platform/restore/common/restoreServiceImpl.ts b/src/sql/platform/restore/common/restoreServiceImpl.ts index 397977e10d..94c2fe8afe 100644 --- a/src/sql/platform/restore/common/restoreServiceImpl.ts +++ b/src/sql/platform/restore/common/restoreServiceImpl.ts @@ -20,7 +20,7 @@ import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerC import * as Utils from 'sql/platform/connection/common/utils'; 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 { TaskStatus, TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/platform/taskHistory/common/taskService.ts b/src/sql/platform/taskHistory/common/taskService.ts index 4881eb7c78..f9f28f1db7 100644 --- a/src/sql/platform/taskHistory/common/taskService.ts +++ b/src/sql/platform/taskHistory/common/taskService.ts @@ -5,7 +5,7 @@ 'use strict'; import * as azdata from 'azdata'; -import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode'; +import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/parts/taskHistory/common/taskNode'; 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'; diff --git a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts index cefe60b618..0b347bec93 100644 --- a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts +++ b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts @@ -15,7 +15,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; -import { TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; @extHostNamedCustomer(SqlMainContext.MainThreadObjectExplorer) export class MainThreadObjectExplorer implements MainThreadObjectExplorerShape { diff --git a/src/sql/workbench/browser/parts/views/customView.ts b/src/sql/workbench/browser/parts/views/customView.ts index a11f6eab0f..895d06be67 100644 --- a/src/sql/workbench/browser/parts/views/customView.ts +++ b/src/sql/workbench/browser/parts/views/customView.ts @@ -43,7 +43,7 @@ import { ILabelService } from 'vs/platform/label/common/label'; import { dirname } from 'vs/base/common/resources'; import { ITreeItem, ITreeView } from 'sql/workbench/common/views'; -import { IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; import { equalsIgnoreCase } from 'vs/base/common/strings'; import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/common/nodeContext'; diff --git a/src/sql/workbench/parts/connection/browser/connection.contribution.ts b/src/sql/workbench/parts/connection/browser/connection.contribution.ts index 00e41c5524..f962f74ef9 100644 --- a/src/sql/workbench/parts/connection/browser/connection.contribution.ts +++ b/src/sql/workbench/parts/connection/browser/connection.contribution.ts @@ -5,7 +5,7 @@ import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; -import { AddServerGroupAction, AddServerAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; +import { AddServerGroupAction, AddServerAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/parts/connection/common/connectionActions'; import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions'; diff --git a/src/sql/workbench/parts/connection/browser/media/collapsed-dark.svg b/src/sql/workbench/parts/connection/browser/media/collapsed-dark.svg new file mode 100644 index 0000000000..cf5c3641aa --- /dev/null +++ b/src/sql/workbench/parts/connection/browser/media/collapsed-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/sql/parts/objectExplorer/viewlet/media/connected_active_server.svg b/src/sql/workbench/parts/connection/browser/media/connected_active_server.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/connected_active_server.svg rename to src/sql/workbench/parts/connection/browser/media/connected_active_server.svg diff --git a/src/sql/parts/objectExplorer/viewlet/media/connected_active_server_inverse.svg b/src/sql/workbench/parts/connection/browser/media/connected_active_server_inverse.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/connected_active_server_inverse.svg rename to src/sql/workbench/parts/connection/browser/media/connected_active_server_inverse.svg diff --git a/src/sql/workbench/parts/connection/browser/media/connectionViewlet.css b/src/sql/workbench/parts/connection/browser/media/connectionViewlet.css new file mode 100644 index 0000000000..bdf8f0b80a --- /dev/null +++ b/src/sql/workbench/parts/connection/browser/media/connectionViewlet.css @@ -0,0 +1,138 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +/* --- Registered servers tree viewlet --- */ +.server-explorer-viewlet .monaco-tree .monaco-tree-row .content .server-group { + cursor: default; + width: 100%; + display: flex; + align-items: center; +} + +/* Bold font style does not go well with CJK fonts */ +.server-explorer-viewlet:lang(zh-Hans) .monaco-tree .monaco-tree-row .server-group, +.server-explorer-viewlet:lang(zh-Hant) .monaco-tree .monaco-tree-row .server-group, +.server-explorer-viewlet:lang(ja) .monaco-tree .monaco-tree-row .server-group, +.server-explorer-viewlet:lang(ko) .monaco-tree .monaco-tree-row .server-group { font-weight: normal; } + +/* High Contrast Theming */ +.hc-black .monaco-workbench .server-explorer-viewlet .server-group { + line-height: 20px; +} + +.monaco-workbench > .activitybar .monaco-action-bar .action-label.serverTree { + background-size: 22px; + background-repeat: no-repeat; + background-position: 50% !important; +} + +.server-explorer-viewlet .object-explorer-view { + height: calc(100% - 36px); +} + +.server-explorer-viewlet .server-group { + height: 38px; + line-height: 38px; + color: #ffffff; +} + +.server-explorer-viewlet .monaco-action-bar .action-label { + margin-right: 0.3em; + margin-left: 0.3em; + line-height: 15px; + width: 10px !important; + height: 10px !important; +} + +/* Add space beneath the button */ +.new-connection .monaco-text-button { +margin-bottom: 2px; +} + +/* display action buttons on hover */ +.server-explorer-viewlet .monaco-tree .monaco-tree-row > .content { + display: flex; +} + +/* Added to display the tree in connection dialog */ +.server-explorer-viewlet { + height: 100%; +} + +.explorer-servers { + height: 100%; +} + +/* search box */ +.server-explorer-viewlet .search-box { + padding-bottom: 4px; + margin: auto; + width: 95%; +} + +/* OE and connection element group */ +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile, +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group { + padding: 5px; + overflow: hidden; +} + +/* OE and connection label */ +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .label, +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group > .label { + text-overflow: ellipsis; + overflow: hidden; +} + +/* OE and connection icon */ +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon, +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .object-element-group > .icon { + float: left; + height: 16px; + width: 16px; + padding-right: 10px; +} + +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.connected { + background: url('connected_active_server.svg') center center no-repeat; +} + +.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.connected, +.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.connected{ + background: url('connected_active_server_inverse.svg') center center no-repeat; +} + +.monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.disconnected { + background: url('disconnected_server.svg') center center no-repeat; +} + +.vs-dark .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.disconnected, +.hc-black .monaco-tree .monaco-tree-rows > .monaco-tree-row > .content > .connection-tile > .icon.server-page.disconnected{ + background: url('disconnected_server_inverse.svg') center center no-repeat; +} + +/* loading for OE node */ +.server-explorer-viewlet .monaco-tree .monaco-tree-rows > .monaco-tree-row > .icon.in-progress .connection-tile:before, +.server-explorer-viewlet .monaco-tree .monaco-tree-rows > .monaco-tree-row > .icon.in-progress .object-element-group:before { + position: absolute; + display: block; + width: 36px; + height: 100%; + top: 0; + left: -35px; +} + +.monaco-tree .monaco-tree-rows.show-twisties > .monaco-tree-row.expanded.has-children > .content.server-group:before { + background: url('expanded-dark.svg') 50% 50% no-repeat; +} + +.monaco-tree .monaco-tree-rows.show-twisties > .monaco-tree-row.has-children > .content.server-group:before { + background: url('collapsed-dark.svg') 50% 50% no-repeat; +} + +/* Add connection button */ +.server-explorer-viewlet .button-section { + padding: 20px; +} \ No newline at end of file diff --git a/src/sql/workbench/parts/connection/browser/media/disconnected_server.svg b/src/sql/workbench/parts/connection/browser/media/disconnected_server.svg new file mode 100644 index 0000000000..da2a3cada1 --- /dev/null +++ b/src/sql/workbench/parts/connection/browser/media/disconnected_server.svg @@ -0,0 +1 @@ +disconnected_server_16x16 \ No newline at end of file diff --git a/src/sql/workbench/parts/connection/browser/media/disconnected_server_inverse.svg b/src/sql/workbench/parts/connection/browser/media/disconnected_server_inverse.svg new file mode 100644 index 0000000000..ebed595c90 --- /dev/null +++ b/src/sql/workbench/parts/connection/browser/media/disconnected_server_inverse.svg @@ -0,0 +1 @@ +disconnected_server_inverse_16x16 \ No newline at end of file diff --git a/src/sql/workbench/parts/connection/browser/media/expanded-dark.svg b/src/sql/workbench/parts/connection/browser/media/expanded-dark.svg new file mode 100644 index 0000000000..73d41e6399 --- /dev/null +++ b/src/sql/workbench/parts/connection/browser/media/expanded-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts b/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts index c4465d526a..0bd896ae5e 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts @@ -18,11 +18,11 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IAction } from 'vs/base/common/actions'; -import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; import { ActiveConnectionsFilterAction, AddServerAction, AddServerGroupAction -} from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; +} from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions'; diff --git a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts b/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts index 77ff08e511..84c3319ad9 100644 --- a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts +++ b/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; -import { IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; import { ITreeItem } from 'sql/workbench/common/views'; import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts b/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts index 64e5da6fee..7e70a2ff5c 100644 --- a/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts +++ b/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionType, IConnectableInput, IConnectionCompletionOptions, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/parts/extensions/sqlExtensionsHelper.ts b/src/sql/workbench/parts/extensions/browser/contributionRenders.ts similarity index 99% rename from src/sql/parts/extensions/sqlExtensionsHelper.ts rename to src/sql/workbench/parts/extensions/browser/contributionRenders.ts index ea53ed0aa2..ec3c5d8d27 100644 --- a/src/sql/parts/extensions/sqlExtensionsHelper.ts +++ b/src/sql/workbench/parts/extensions/browser/contributionRenders.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { append, $ } from 'vs/base/browser/dom'; import { IInsightTypeContrib } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IDashboardTabContrib } from 'sql/workbench/parts/dashboard/common/dashboardTab.contribution'; diff --git a/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts b/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts similarity index 97% rename from src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts rename to src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts index 94553dd3bf..fdc8618a0f 100644 --- a/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts @@ -9,19 +9,18 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; -import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; 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/workbench/services/objectExplorer/common/objectExplorerService'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import Severity from 'vs/base/common/severity'; -import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; +import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { ConnectionViewletPanel } from 'sql/workbench/parts/dataExplorer/browser/connectionViewletPanel'; export class RefreshAction extends Action { diff --git a/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts b/src/sql/workbench/parts/objectExplorer/browser/dragAndDropController.ts similarity index 92% rename from src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts rename to src/sql/workbench/parts/objectExplorer/browser/dragAndDropController.ts index c8fe9e74ae..61b584bdfe 100644 --- a/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/dragAndDropController.ts @@ -3,15 +3,13 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ITree, IDragAndDrop, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_REJECT } from 'vs/base/parts/tree/browser/tree'; import * as Constants from 'sql/platform/connection/common/constants'; import { DragMouseEvent } from 'vs/base/browser/mouseEvent'; -import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { IDragAndDropData } from 'vs/base/browser/dnd'; /** @@ -19,8 +17,8 @@ import { IDragAndDropData } from 'vs/base/browser/dnd'; */ export class ServerTreeDragAndDrop implements IDragAndDrop { - constructor(@IConnectionManagementService private _connectionManagementService: IConnectionManagementService, - @IInstantiationService private _instantiationService: IInstantiationService + constructor( + @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, ) { } @@ -153,11 +151,6 @@ export class ServerTreeDragAndDrop implements IDragAndDrop { */ export class RecentConnectionsDragAndDrop implements IDragAndDrop { - constructor(@IConnectionManagementService private connectionManagementService: IConnectionManagementService, - @IInstantiationService private instantiationService: IInstantiationService - ) { - } - /** * Returns a uri if the given element should be allowed to drag. * Returns null, otherwise. diff --git a/src/sql/parts/objectExplorer/viewlet/media/add_server.svg b/src/sql/workbench/parts/objectExplorer/browser/media/add_server.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/add_server.svg rename to src/sql/workbench/parts/objectExplorer/browser/media/add_server.svg diff --git a/src/sql/parts/objectExplorer/viewlet/media/add_server_inverse.svg b/src/sql/workbench/parts/objectExplorer/browser/media/add_server_inverse.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/add_server_inverse.svg rename to src/sql/workbench/parts/objectExplorer/browser/media/add_server_inverse.svg diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server.svg b/src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server.svg new file mode 100644 index 0000000000..c8fc5dd61c --- /dev/null +++ b/src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server.svg @@ -0,0 +1 @@ +connected_active_server_16x16 \ No newline at end of file diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server_inverse.svg b/src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server_inverse.svg new file mode 100644 index 0000000000..5f9888af87 --- /dev/null +++ b/src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server_inverse.svg @@ -0,0 +1 @@ +connected_active_server_inverse_16x16 \ No newline at end of file diff --git a/src/sql/parts/objectExplorer/viewlet/media/new_servergroup.svg b/src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/new_servergroup.svg rename to src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup.svg diff --git a/src/sql/parts/objectExplorer/viewlet/media/new_servergroup_inverse.svg b/src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup_inverse.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/new_servergroup_inverse.svg rename to src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup_inverse.svg diff --git a/src/sql/parts/objectExplorer/serverGroupDialog/media/serverGroupDialog.css b/src/sql/workbench/parts/objectExplorer/browser/media/serverGroupDialog.css similarity index 93% rename from src/sql/parts/objectExplorer/serverGroupDialog/media/serverGroupDialog.css rename to src/sql/workbench/parts/objectExplorer/browser/media/serverGroupDialog.css index 019712cce5..9117830a8e 100644 --- a/src/sql/parts/objectExplorer/serverGroupDialog/media/serverGroupDialog.css +++ b/src/sql/workbench/parts/objectExplorer/browser/media/serverGroupDialog.css @@ -9,9 +9,9 @@ } .group-color-options .server-group-color { - flex: 1 1 auto; + flex: 1 1 auto; height: 20px; - margin: 5px; + margin: 5px; } .server-group-dialog { diff --git a/src/sql/parts/objectExplorer/viewlet/media/serverTreeActions.css b/src/sql/workbench/parts/objectExplorer/browser/media/serverTreeActions.css similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/serverTreeActions.css rename to src/sql/workbench/parts/objectExplorer/browser/media/serverTreeActions.css diff --git a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts b/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts similarity index 98% rename from src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts rename to src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts index 2ed8352517..be4b4f431f 100644 --- a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts @@ -3,7 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { localize } from 'vs/nls'; import { Action } from 'vs/base/common/actions'; import { ITree } from 'vs/base/parts/tree/browser/tree'; @@ -12,14 +11,14 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import * as azdata from 'azdata'; import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptDeleteAction, ScriptAlterAction } from 'sql/workbench/common/actions'; -import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; -import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; -import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; +import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; diff --git a/src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts b/src/sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource.ts similarity index 99% rename from src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts rename to src/sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource.ts index a566a4093b..adb37d2d57 100644 --- a/src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource.ts @@ -3,7 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts b/src/sql/workbench/parts/objectExplorer/browser/serverGroupDialog.ts similarity index 99% rename from src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts rename to src/sql/workbench/parts/objectExplorer/browser/serverGroupDialog.ts index 7e2ad5dc7c..28c5287342 100644 --- a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverGroupDialog.ts @@ -22,7 +22,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { Button } from 'sql/base/browser/ui/button/button'; 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 { ServerGroupViewModel } from 'sql/workbench/parts/objectExplorer/common/serverGroupViewModel'; import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts similarity index 94% rename from src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts rename to src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts index fbc98446f7..aed1bf1be6 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts @@ -3,7 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; import { IAction } from 'vs/base/common/actions'; @@ -14,21 +13,21 @@ import { fillInActions } from 'vs/platform/actions/browser/menuItemActionItem'; import { DisconnectConnectionAction, AddServerAction, DeleteConnectionAction, RefreshAction, EditServerGroupAction -} from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; +} from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; import { ObjectExplorerActionUtilities, ManageConnectionAction, OEAction -} from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; -import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; +} from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { MenuId, IMenuService } from 'vs/platform/actions/common/actions'; import { NewQueryAction, BackupAction, RestoreAction } from 'sql/workbench/common/actions'; import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { TreeNodeContextKey } from 'sql/parts/objectExplorer/viewlet/treeNodeContextKey'; +import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeController.ts similarity index 78% rename from src/sql/parts/objectExplorer/viewlet/serverTreeController.ts rename to src/sql/workbench/parts/objectExplorer/browser/serverTreeController.ts index b00cc52f9e..2db3770e4d 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeController.ts @@ -3,37 +3,30 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ITree, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree'; -import treedefaults = require('vs/base/parts/tree/browser/treeDefaults'); -import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; +import * as treedefaults from 'vs/base/parts/tree/browser/treeDefaults'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider'; -import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; -import { OpenMode } from 'vs/base/parts/tree/browser/treeDefaults'; -import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { ServerTreeActionProvider } from 'sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider'; +import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; /** * Extends the tree controller to handle clicks on the tree elements */ export class ServerTreeController extends treedefaults.DefaultController { - constructor(private actionProvider: ServerTreeActionProvider, - @IEditorService private editorService: IEditorService, + constructor( + private actionProvider: ServerTreeActionProvider, @IContextMenuService private contextMenuService: IContextMenuService, - @ITelemetryService private telemetryService: ITelemetryService, @IKeybindingService private keybindingService: IKeybindingService ) { super({ clickBehavior: treedefaults.ClickBehavior.ON_MOUSE_DOWN, - openMode: OpenMode.SINGLE_CLICK + openMode: treedefaults.OpenMode.SINGLE_CLICK }); } diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts similarity index 95% rename from src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts rename to src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts index 97dc5d0102..044cc0da47 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts @@ -3,13 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; 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 { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; -import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import Severity from 'vs/base/common/severity'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts similarity index 91% rename from src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts rename to src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts index 350e05f714..e5c18f3fc7 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts @@ -3,7 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import 'vs/css!sql/media/objectTypes/objecttypes'; import 'vs/css!sql/media/icons/common-icons'; @@ -11,13 +10,30 @@ import * as dom from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; -import { IConnectionProfileGroupTemplateData, IConnectionTemplateData, IObjectExplorerTemplateData } from 'sql/parts/objectExplorer/viewlet/templateData'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; + +export interface IConnectionTemplateData { + root: HTMLElement; + label: HTMLSpanElement; + icon: HTMLElement; + connectionProfile: ConnectionProfile; +} + +export interface IConnectionProfileGroupTemplateData { + root: HTMLElement; + name: HTMLSpanElement; + inputBox: InputBox; +} + +export interface IObjectExplorerTemplateData { + root: HTMLElement; + label: HTMLSpanElement; + icon: HTMLElement; + treeNode: TreeNode; +} /** * Renders the tree items. @@ -38,11 +54,9 @@ export class ServerTreeRenderer implements IRenderer { */ private _isCompact: boolean = false; - constructor(isCompact: boolean, - @IInstantiationService private _instantiationService: IInstantiationService, - @IContextViewService private _contextViewService: IContextViewService, - @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, - @IThemeService private _themeService: IThemeService + constructor( + isCompact: boolean, + @IConnectionManagementService private _connectionManagementService: IConnectionManagementService ) { // isCompact defaults to false unless explicitly set by instantiation call. if (isCompact) { diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts similarity index 96% rename from src/sql/parts/objectExplorer/viewlet/serverTreeView.ts rename to src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts index 994eb36ab2..5ffe8d56da 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts @@ -19,19 +19,19 @@ import { append, $, hide, show } from 'vs/base/browser/dom'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as ConnectionUtils from 'sql/platform/connection/common/utils'; -import { ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; +import { ActiveConnectionsFilterAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -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 { TreeCreationUtils } from 'sql/workbench/parts/objectExplorer/browser/treeCreationUtils'; +import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; 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/platform/theme/common/styler'; -import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; -import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider'; +import { ServerTreeActionProvider } from 'sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { isHidden } from 'sql/base/browser/dom'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; diff --git a/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts b/src/sql/workbench/parts/objectExplorer/browser/treeCreationUtils.ts similarity index 80% rename from src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts rename to src/sql/workbench/parts/objectExplorer/browser/treeCreationUtils.ts index 615d1f5204..927d8d95ef 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeCreationUtils.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/treeCreationUtils.ts @@ -4,18 +4,18 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/serverTreeActions'; -import nls = require('vs/nls'); + +import * as nls from 'vs/nls'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ServerTreeRenderer } from 'sql/parts/objectExplorer/viewlet/serverTreeRenderer'; -import { ServerTreeDataSource } from 'sql/parts/objectExplorer/viewlet/serverTreeDataSource'; -import { ServerTreeController } from 'sql/parts/objectExplorer/viewlet/serverTreeController'; -import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider'; +import { ServerTreeRenderer } from 'sql/workbench/parts/objectExplorer/browser/serverTreeRenderer'; +import { ServerTreeDataSource } from 'sql/workbench/parts/objectExplorer/browser/serverTreeDataSource'; +import { ServerTreeController } from 'sql/workbench/parts/objectExplorer/browser/serverTreeController'; +import { ServerTreeActionProvider } from 'sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider'; import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'vs/base/parts/tree/browser/treeDefaults'; import { IController } from 'vs/base/parts/tree/browser/tree'; -import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/parts/objectExplorer/viewlet/dragAndDropController'; -import { RecentConnectionDataSource } from 'sql/parts/objectExplorer/viewlet/recentConnectionDataSource'; -import { ScrollbarVisibility } from 'vs/base/common/scrollable'; +import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/workbench/parts/objectExplorer/browser/dragAndDropController'; +import { RecentConnectionDataSource } from 'sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource'; export class TreeCreationUtils { /** diff --git a/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts b/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts similarity index 94% rename from src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts rename to src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts index 786f8684fd..c577531ffc 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts @@ -9,8 +9,8 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf 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'; -import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; export class TreeSelectionHandler { progressRunner: IProgressRunner; @@ -18,7 +18,7 @@ export class TreeSelectionHandler { private _clicks: number = 0; private _doubleClickTimeoutTimer: NodeJS.Timer = undefined; - constructor( @IProgressService private _progressService: IProgressService) { + constructor(@IProgressService private _progressService: IProgressService) { } diff --git a/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts b/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts similarity index 98% rename from src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts rename to src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts index c005883508..38efca6152 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts @@ -8,13 +8,12 @@ import { IConnectionManagementService, IConnectionCompletionOptions, IConnection import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; -import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; +import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; -import errors = require('vs/base/common/errors'); +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import * as errors from 'vs/base/common/errors'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; - export interface IExpandableTree extends ITree { // {{SQL CARBON EDIT }} - add back deleted VS Code tree methods /** diff --git a/src/sql/parts/objectExplorer/common/nodeType.ts b/src/sql/workbench/parts/objectExplorer/common/nodeType.ts similarity index 99% rename from src/sql/parts/objectExplorer/common/nodeType.ts rename to src/sql/workbench/parts/objectExplorer/common/nodeType.ts index 284e759600..0d35b53170 100644 --- a/src/sql/parts/objectExplorer/common/nodeType.ts +++ b/src/sql/workbench/parts/objectExplorer/common/nodeType.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; export class NodeType { public static Folder = 'Folder'; diff --git a/src/sql/parts/objectExplorer/common/objectExplorerViewTreeShim.ts b/src/sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim.ts similarity index 98% rename from src/sql/parts/objectExplorer/common/objectExplorerViewTreeShim.ts rename to src/sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim.ts index 8f12d10d8f..1d306f769a 100644 --- a/src/sql/parts/objectExplorer/common/objectExplorerViewTreeShim.ts +++ b/src/sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim.ts @@ -2,10 +2,9 @@ * 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 { Deferred } from 'sql/base/common/promise'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionType, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution.ts b/src/sql/workbench/parts/objectExplorer/common/serverGroup.contribution.ts similarity index 96% rename from src/sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution.ts rename to src/sql/workbench/parts/objectExplorer/common/serverGroup.contribution.ts index ad594249e6..fee7acf67d 100644 --- a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution.ts +++ b/src/sql/workbench/parts/objectExplorer/common/serverGroup.contribution.ts @@ -2,6 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { IConfigurationRegistry, Extensions, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; diff --git a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts b/src/sql/workbench/parts/objectExplorer/common/serverGroupViewModel.ts similarity index 99% rename from src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts rename to src/sql/workbench/parts/objectExplorer/common/serverGroupViewModel.ts index 6a4d6df66a..952a4c0069 100644 --- a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts +++ b/src/sql/workbench/parts/objectExplorer/common/serverGroupViewModel.ts @@ -3,7 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as TypeChecker from 'vs/base/common/types'; diff --git a/src/sql/parts/objectExplorer/common/treeNode.ts b/src/sql/workbench/parts/objectExplorer/common/treeNode.ts similarity index 97% rename from src/sql/parts/objectExplorer/common/treeNode.ts rename to src/sql/workbench/parts/objectExplorer/common/treeNode.ts index 550090d881..849654be6e 100644 --- a/src/sql/parts/objectExplorer/common/treeNode.ts +++ b/src/sql/workbench/parts/objectExplorer/common/treeNode.ts @@ -3,10 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { NodeType, SqlThemeIcon } from 'sql/parts/objectExplorer/common/nodeType'; +import { NodeType, SqlThemeIcon } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import * as azdata from 'sqlops'; import * as UUID from 'vs/base/common/uuid'; diff --git a/src/sql/parts/objectExplorer/viewlet/treeNodeContextKey.ts b/src/sql/workbench/parts/objectExplorer/common/treeNodeContextKey.ts similarity index 94% rename from src/sql/parts/objectExplorer/viewlet/treeNodeContextKey.ts rename to src/sql/workbench/parts/objectExplorer/common/treeNodeContextKey.ts index 0063f58e15..1d772ac263 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeNodeContextKey.ts +++ b/src/sql/workbench/parts/objectExplorer/common/treeNodeContextKey.ts @@ -3,11 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { IConnectionProfile } from 'azdata'; -import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; export class TreeNodeContextKey implements IContextKey { diff --git a/src/sql/parts/queryPlan/topOperations.ts b/src/sql/workbench/parts/queryPlan/browser/topOperations.ts similarity index 98% rename from src/sql/parts/queryPlan/topOperations.ts rename to src/sql/workbench/parts/queryPlan/browser/topOperations.ts index 9d050442c6..f4cd2122a0 100644 --- a/src/sql/parts/queryPlan/topOperations.ts +++ b/src/sql/workbench/parts/queryPlan/browser/topOperations.ts @@ -2,14 +2,13 @@ * 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 { Dimension } from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { Table } from 'sql/base/browser/ui/table/table'; -import { PlanXmlParser } from 'sql/parts/queryPlan/planXmlParser'; +import { PlanXmlParser } from 'sql/workbench/parts/queryPlan/common/planXmlParser'; import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/parts/queryPlan/planXmlParser.ts b/src/sql/workbench/parts/queryPlan/common/planXmlParser.ts similarity index 100% rename from src/sql/parts/queryPlan/planXmlParser.ts rename to src/sql/workbench/parts/queryPlan/common/planXmlParser.ts diff --git a/src/sql/parts/queryPlan/queryPlanInput.ts b/src/sql/workbench/parts/queryPlan/common/queryPlanInput.ts similarity index 100% rename from src/sql/parts/queryPlan/queryPlanInput.ts rename to src/sql/workbench/parts/queryPlan/common/queryPlanInput.ts diff --git a/src/sql/parts/queryPlan/media/qp.css b/src/sql/workbench/parts/queryPlan/electron-browser/media/qp.css similarity index 100% rename from src/sql/parts/queryPlan/media/qp.css rename to src/sql/workbench/parts/queryPlan/electron-browser/media/qp.css diff --git a/src/sql/parts/queryPlan/media/qp_icons.png b/src/sql/workbench/parts/queryPlan/electron-browser/media/qp_icons.png similarity index 100% rename from src/sql/parts/queryPlan/media/qp_icons.png rename to src/sql/workbench/parts/queryPlan/electron-browser/media/qp_icons.png diff --git a/src/sql/parts/queryPlan/queryPlan.component.ts b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.component.ts similarity index 100% rename from src/sql/parts/queryPlan/queryPlan.component.ts rename to src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.component.ts diff --git a/src/sql/parts/queryPlan/queryPlan.module.ts b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.module.ts similarity index 94% rename from src/sql/parts/queryPlan/queryPlan.module.ts rename to src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.module.ts index e555122bbf..59cd76409c 100644 --- a/src/sql/parts/queryPlan/queryPlan.module.ts +++ b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.module.ts @@ -8,7 +8,7 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; -import { QueryPlanComponent } from 'sql/parts/queryPlan/queryPlan.component'; +import { QueryPlanComponent } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/queryPlan/queryPlan.ts b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.ts similarity index 97% rename from src/sql/parts/queryPlan/queryPlan.ts rename to src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.ts index cdeb1fa8f1..ef39834f8b 100644 --- a/src/sql/parts/queryPlan/queryPlan.ts +++ b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlan.ts @@ -2,7 +2,6 @@ * 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 * as QP from 'html-query-plan'; @@ -10,7 +9,7 @@ import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel'; import { Dimension, clearNode } from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; -import { dispose, Disposable } from 'vs/base/common/lifecycle'; +import { dispose } from 'vs/base/common/lifecycle'; export class QueryPlanState { xml: string; diff --git a/src/sql/parts/queryPlan/queryPlanEditor.ts b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts similarity index 94% rename from src/sql/parts/queryPlan/queryPlanEditor.ts rename to src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts index 55084317c0..e2428f48f3 100644 --- a/src/sql/parts/queryPlan/queryPlanEditor.ts +++ b/src/sql/workbench/parts/queryPlan/electron-browser/queryPlanEditor.ts @@ -10,20 +10,18 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; -import { QueryPlanModule } from 'sql/parts/queryPlan/queryPlan.module'; +import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; +import { QueryPlanModule } from 'sql/workbench/parts/queryPlan/electron-browser/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/workbench/services/queryEditor/common/queryEditorService'; import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; import { IQueryPlanParams } from 'sql/platform/bootstrap/node/bootstrapParams'; -import { QUERYPLAN_SELECTOR } from 'sql/parts/queryPlan/queryPlan.component'; +import { QUERYPLAN_SELECTOR } from 'sql/workbench/parts/queryPlan/electron-browser/queryPlan.component'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; -declare let QP; - export class QueryPlanEditor extends BaseEditor { public static ID: string = 'workbench.editor.queryplan'; diff --git a/src/sql/parts/taskHistory/viewlet/media/status_queuedtask.svg b/src/sql/workbench/parts/taskHistory/browser/media/status_queuedtask.svg similarity index 100% rename from src/sql/parts/taskHistory/viewlet/media/status_queuedtask.svg rename to src/sql/workbench/parts/taskHistory/browser/media/status_queuedtask.svg diff --git a/src/sql/parts/taskHistory/viewlet/media/status_queuedtask_inverse.svg b/src/sql/workbench/parts/taskHistory/browser/media/status_queuedtask_inverse.svg similarity index 100% rename from src/sql/parts/taskHistory/viewlet/media/status_queuedtask_inverse.svg rename to src/sql/workbench/parts/taskHistory/browser/media/status_queuedtask_inverse.svg diff --git a/src/sql/parts/taskHistory/viewlet/media/taskHistoryViewlet.css b/src/sql/workbench/parts/taskHistory/browser/media/taskHistoryViewlet.css similarity index 100% rename from src/sql/parts/taskHistory/viewlet/media/taskHistoryViewlet.css rename to src/sql/workbench/parts/taskHistory/browser/media/taskHistoryViewlet.css diff --git a/src/sql/parts/taskHistory/common/taskHistory.contribution.ts b/src/sql/workbench/parts/taskHistory/browser/taskHistory.contribution.ts similarity index 91% rename from src/sql/parts/taskHistory/common/taskHistory.contribution.ts rename to src/sql/workbench/parts/taskHistory/browser/taskHistory.contribution.ts index 8fd7de7a4c..3d5bfe8cda 100644 --- a/src/sql/parts/taskHistory/common/taskHistory.contribution.ts +++ b/src/sql/workbench/parts/taskHistory/browser/taskHistory.contribution.ts @@ -3,21 +3,19 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import nls = require('vs/nls'); import 'vs/css!sql/media/actionBarLabel'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { localize } from 'vs/nls'; import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; -import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IViewlet } from 'vs/workbench/common/viewlet'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; -import { VIEWLET_ID, TaskHistoryViewlet } from 'sql/parts/taskHistory/viewlet/taskHistoryViewlet'; -import lifecycle = require('vs/base/common/lifecycle'); -import ext = require('vs/workbench/common/contributions'); +import { VIEWLET_ID, TaskHistoryViewlet } from 'sql/workbench/parts/taskHistory/browser/taskHistoryViewlet'; +import * as lifecycle from 'vs/base/common/lifecycle'; +import * as ext from 'vs/workbench/common/contributions'; import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; @@ -76,7 +74,7 @@ export class StatusUpdater implements ext.IWorkbenchContribution { // Viewlet Action export class TaskHistoryViewletAction extends ToggleViewletAction { public static ID = VIEWLET_ID; - public static LABEL = nls.localize({ key: 'showTaskHistory', comment: ['Show Task History'] }, 'Show Task History'); + public static LABEL = localize({ key: 'showTaskHistory', comment: ['Show Task History'] }, 'Show Task History'); constructor( id: string, diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryActionProvider.ts b/src/sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider.ts similarity index 90% rename from src/sql/parts/taskHistory/viewlet/taskHistoryActionProvider.ts rename to src/sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider.ts index 378af9ec64..c8de09a26f 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryActionProvider.ts +++ b/src/sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider.ts @@ -3,13 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode'; -import { CancelAction, ScriptAction } from 'sql/parts/taskHistory/viewlet/taskAction'; +import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/parts/taskHistory/common/taskNode'; +import { CancelAction, ScriptAction } from 'sql/workbench/parts/taskHistory/common/taskAction'; /** * Provides actions for the history tasks diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryController.ts b/src/sql/workbench/parts/taskHistory/browser/taskHistoryController.ts similarity index 82% rename from src/sql/parts/taskHistory/viewlet/taskHistoryController.ts rename to src/sql/workbench/parts/taskHistory/browser/taskHistoryController.ts index d4666e92ec..f1cd0d186e 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryController.ts +++ b/src/sql/workbench/parts/taskHistory/browser/taskHistoryController.ts @@ -3,26 +3,22 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ITree, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree'; -import treedefaults = require('vs/base/parts/tree/browser/treeDefaults'); -import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; +import * as treedefaults from 'vs/base/parts/tree/browser/treeDefaults'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { TaskHistoryActionProvider } from 'sql/parts/taskHistory/viewlet/taskHistoryActionProvider'; +import { TaskHistoryActionProvider } from 'sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider'; /** * Extends the tree controller to handle clicks on the tree elements */ export class TaskHistoryController extends treedefaults.DefaultController { - constructor(private actionProvider: TaskHistoryActionProvider, - @IEditorService private editorService: IEditorService, + constructor( + private actionProvider: TaskHistoryActionProvider, @IContextMenuService private contextMenuService: IContextMenuService, - @ITelemetryService private telemetryService: ITelemetryService, @IKeybindingService private keybindingService: IKeybindingService ) { super({ clickBehavior: treedefaults.ClickBehavior.ON_MOUSE_DOWN }); diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryDataSource.ts b/src/sql/workbench/parts/taskHistory/browser/taskHistoryDataSource.ts similarity index 94% rename from src/sql/parts/taskHistory/viewlet/taskHistoryDataSource.ts rename to src/sql/workbench/parts/taskHistory/browser/taskHistoryDataSource.ts index 5911fb9ee0..400d77bd67 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryDataSource.ts +++ b/src/sql/workbench/parts/taskHistory/browser/taskHistoryDataSource.ts @@ -3,10 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; -import { TaskNode } from 'sql/parts/taskHistory/common/taskNode'; +import { TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode'; /** * Implements the DataSource(that returns a parent/children of an element) for the task history diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryRenderer.ts b/src/sql/workbench/parts/taskHistory/browser/taskHistoryRenderer.ts similarity index 94% rename from src/sql/parts/taskHistory/viewlet/taskHistoryRenderer.ts rename to src/sql/workbench/parts/taskHistory/browser/taskHistoryRenderer.ts index c2d6b68707..47c8619341 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryRenderer.ts +++ b/src/sql/workbench/parts/taskHistory/browser/taskHistoryRenderer.ts @@ -3,15 +3,22 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; -import { $ } from 'vs/base/browser/dom'; import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; -import { ITaskHistoryTemplateData } from 'sql/parts/taskHistory/viewlet/templateData'; -import { TaskNode, TaskStatus } from 'sql/parts/taskHistory/common/taskNode'; -import dom = require('vs/base/browser/dom'); +import { TaskNode, TaskStatus } from 'sql/workbench/parts/taskHistory/common/taskNode'; +import * as dom from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; import * as Utils from 'sql/platform/connection/common/utils'; +const $ = dom.$; + +export interface ITaskHistoryTemplateData { + root: HTMLElement; + icon: HTMLElement; + title: HTMLSpanElement; + description: HTMLSpanElement; + time: HTMLSpanElement; +} + /** * Renders the tree items. * Uses the dom template to render task history. diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryView.ts b/src/sql/workbench/parts/taskHistory/browser/taskHistoryView.ts similarity index 86% rename from src/sql/parts/taskHistory/viewlet/taskHistoryView.ts rename to src/sql/workbench/parts/taskHistory/browser/taskHistoryView.ts index c5b598b8c6..0a52218ae3 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryView.ts +++ b/src/sql/workbench/parts/taskHistory/browser/taskHistoryView.ts @@ -3,8 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import nls = require('vs/nls'); -import errors = require('vs/base/common/errors'); +import * as errors from 'vs/base/common/errors'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import Severity from 'vs/base/common/severity'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; @@ -16,14 +15,14 @@ import { DefaultFilter, DefaultDragAndDrop, DefaultAccessibilityProvider } from import { localize } from 'vs/nls'; import { hide, $, append } from 'vs/base/browser/dom'; -import { TaskHistoryRenderer } from 'sql/parts/taskHistory/viewlet/taskHistoryRenderer'; -import { TaskHistoryDataSource } from 'sql/parts/taskHistory/viewlet/taskHistoryDataSource'; -import { TaskHistoryController } from 'sql/parts/taskHistory/viewlet/taskHistoryController'; -import { TaskHistoryActionProvider } from 'sql/parts/taskHistory/viewlet/taskHistoryActionProvider'; +import { TaskHistoryRenderer } from 'sql/workbench/parts/taskHistory/browser/taskHistoryRenderer'; +import { TaskHistoryDataSource } from 'sql/workbench/parts/taskHistory/browser/taskHistoryDataSource'; +import { TaskHistoryController } from 'sql/workbench/parts/taskHistory/browser/taskHistoryController'; +import { TaskHistoryActionProvider } from 'sql/workbench/parts/taskHistory/browser/taskHistoryActionProvider'; import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; -import { TaskNode, TaskStatus } from 'sql/parts/taskHistory/common/taskNode'; +import { TaskNode, TaskStatus } from 'sql/workbench/parts/taskHistory/common/taskNode'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; /** * TaskHistoryView implements the dynamic tree view. @@ -93,7 +92,7 @@ export class TaskHistoryView { }, { indentPixels: 10, twistiePixels: 20, - ariaLabel: nls.localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, 'Task history') + ariaLabel: localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, 'Task history') }); } @@ -144,7 +143,7 @@ export class TaskHistoryView { if (isDoubleClick) { if (task.status === TaskStatus.Failed) { var err = task.taskName + ': ' + task.message; - this._errorMessageService.showDialog(Severity.Error, nls.localize('taskError', 'Task error'), err); + this._errorMessageService.showDialog(Severity.Error, localize('taskError', 'Task error'), err); } } } diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts b/src/sql/workbench/parts/taskHistory/browser/taskHistoryViewlet.ts similarity index 91% rename from src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts rename to src/sql/workbench/parts/taskHistory/browser/taskHistoryViewlet.ts index d9fefdfe3d..210337401a 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts +++ b/src/sql/workbench/parts/taskHistory/browser/taskHistoryViewlet.ts @@ -3,19 +3,16 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!./media/taskHistoryViewlet'; import { Viewlet } from 'vs/workbench/browser/viewlet'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { toggleClass, Dimension } from 'vs/base/browser/dom'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { isPromiseCanceledError } from 'vs/base/common/errors'; import Severity from 'vs/base/common/severity'; -import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { TaskHistoryView } from 'sql/parts/taskHistory/viewlet/taskHistoryView'; +import { TaskHistoryView } from 'sql/workbench/parts/taskHistory/browser/taskHistoryView'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/parts/taskHistory/viewlet/taskAction.ts b/src/sql/workbench/parts/taskHistory/common/taskAction.ts similarity index 96% rename from src/sql/parts/taskHistory/viewlet/taskAction.ts rename to src/sql/workbench/parts/taskHistory/common/taskAction.ts index 76206db9b2..b4998565e9 100644 --- a/src/sql/parts/taskHistory/viewlet/taskAction.ts +++ b/src/sql/workbench/parts/taskHistory/common/taskAction.ts @@ -6,7 +6,7 @@ import { localize } from 'vs/nls'; import { Action } from 'vs/base/common/actions'; import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; -import { TaskNode } from 'sql/parts/taskHistory/common/taskNode'; +import { TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode'; 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/parts/taskHistory/common/taskNode.ts b/src/sql/workbench/parts/taskHistory/common/taskNode.ts similarity index 96% rename from src/sql/parts/taskHistory/common/taskNode.ts rename to src/sql/workbench/parts/taskHistory/common/taskNode.ts index b8a0fe1fea..ee245112ec 100644 --- a/src/sql/parts/taskHistory/common/taskNode.ts +++ b/src/sql/workbench/parts/taskHistory/common/taskNode.ts @@ -2,7 +2,7 @@ * 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 { StopWatch } from 'vs/base/common/stopwatch'; import { generateUuid } from 'vs/base/common/uuid'; @@ -70,13 +70,13 @@ export class TaskNode { public hasChildren: boolean; /** - * Children of this node - */ + * Children of this node + */ public children: TaskNode[]; /** - * Task's message - */ + * Task's message + */ public message: string; /** diff --git a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts index c3c309793e..1c47fcadf2 100644 --- a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts @@ -11,8 +11,8 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { IConnectionManagementService, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; -import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils'; -import { TreeUpdateUtils, IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { TreeCreationUtils } from 'sql/workbench/parts/objectExplorer/browser/treeCreationUtils'; +import { TreeUpdateUtils, IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/workbench/parts/connection/browser/recentConnectionTreeController'; diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts index 2e6f17a744..f811575e1f 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts @@ -18,7 +18,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { attachListStyler } from 'vs/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { ITree } from 'vs/base/parts/tree/browser/tree'; -import { IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; +import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; /** * Implements tree view for file browser diff --git a/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts b/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts index 1a1b336f76..754e233129 100644 --- a/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts +++ b/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; -import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -18,7 +18,7 @@ import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { warn, error } from 'sql/base/common/log'; -import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import * as Utils from 'sql/platform/connection/common/utils'; import { entries } from 'sql/base/common/objects'; diff --git a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts index f8842c2f0d..1bd546a094 100644 --- a/src/sql/workbench/services/queryEditor/browser/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 { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; -import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; +import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/parts/common/customInputConverter'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; diff --git a/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts b/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts index beb6ee491d..44766d0505 100644 --- a/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts +++ b/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts @@ -8,12 +8,12 @@ import Severity from 'vs/base/common/severity'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { SERVER_GROUP_CONFIG, SERVER_GROUP_COLORS_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; +import { SERVER_GROUP_CONFIG, SERVER_GROUP_COLORS_CONFIG } from 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { IServerGroupController, IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ServerGroupDialog } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog'; -import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel'; +import { ServerGroupDialog } from 'sql/workbench/parts/objectExplorer/browser/serverGroupDialog'; +import { ServerGroupViewModel } from 'sql/workbench/parts/objectExplorer/common/serverGroupViewModel'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; export class ServerGroupController implements IServerGroupController { diff --git a/src/sqltest/parts/connection/connectionTreeActions.test.ts b/src/sqltest/parts/connection/connectionTreeActions.test.ts index 8cd352acb0..3e4814d1bb 100644 --- a/src/sqltest/parts/connection/connectionTreeActions.test.ts +++ b/src/sqltest/parts/connection/connectionTreeActions.test.ts @@ -13,23 +13,23 @@ import { RefreshAction, AddServerAction, DeleteConnectionAction, DisconnectConnectionAction, ActiveConnectionsFilterAction, RecentConnectionsFilterAction } - from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; + from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; -import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; import * as Constants from 'sql/platform/connection/common/constants'; import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants'; 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 { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; -import { ServerTreeDataSource } from 'sql/parts/objectExplorer/viewlet/serverTreeDataSource'; +import { ServerTreeDataSource } from 'sql/workbench/parts/objectExplorer/browser/serverTreeDataSource'; import { Emitter } from 'vs/base/common/event'; import Severity from 'vs/base/common/severity'; -import { ObjectExplorerActionsContext, ManageConnectionAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; +import { ObjectExplorerActionsContext, ManageConnectionAction } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { IConnectionResult, IConnectionParams } from 'sql/platform/connection/common/connectionManagement'; -import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; +import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; import { $ } from 'vs/base/browser/dom'; diff --git a/src/sqltest/parts/connection/objectExplorerService.test.ts b/src/sqltest/parts/connection/objectExplorerService.test.ts index 25381b54ff..6ed139367b 100644 --- a/src/sqltest/parts/connection/objectExplorerService.test.ts +++ b/src/sqltest/parts/connection/objectExplorerService.test.ts @@ -9,13 +9,13 @@ import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagem import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; -import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; -import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; -import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { Event, Emitter } from 'vs/base/common/event'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; diff --git a/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts b/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts index 98c2aae3fa..9183f047b5 100644 --- a/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts +++ b/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts @@ -6,7 +6,7 @@ 'use strict'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; diff --git a/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts b/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts index fb9c08c570..3b33391d13 100644 --- a/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts +++ b/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts @@ -11,7 +11,7 @@ import { MainThreadBackgroundTaskManagement, TaskStatus } from 'sql/workbench/ap import { ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; -import { TaskNode } from 'sql/parts/taskHistory/common/taskNode'; +import { TaskNode } from 'sql/workbench/parts/taskHistory/common/taskNode'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts index 4988e0a978..7f6f31331a 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionEditor.ts @@ -53,7 +53,7 @@ import { isUndefined, withUndefinedAsNull } from 'vs/base/common/types'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; // {{SQL CARBON EDIT}} -import { renderDashboardContributions } from 'sql/parts/extensions/sqlExtensionsHelper'; +import { renderDashboardContributions } from 'sql/workbench/parts/extensions/browser/contributionRenders'; // {{SQL CARBON EDIT}} - End function renderBody(body: string): string { diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 6c90751fb2..4aec35423d 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -230,7 +230,7 @@ import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardServi import { DashboardService } from 'sql/platform/dashboard/browser/dashboardServiceImpl'; import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; -import { OEShimService, IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { OEShimService, IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; registerSingleton(IDashboardService, DashboardService); registerSingleton(IDashboardViewService, DashboardViewService); @@ -438,8 +438,8 @@ import 'vs/workbench/contrib/issue/electron-browser/issue.contribution'; // {{SQL CARBON EDIT}} // SQL -import 'sql/parts/taskHistory/common/taskHistory.contribution'; -import 'sql/parts/taskHistory/viewlet/taskHistoryViewlet'; +import 'sql/workbench/parts/taskHistory/browser/taskHistory.contribution'; +import 'sql/workbench/parts/taskHistory/browser/taskHistoryViewlet'; // data explorer import 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution'; @@ -454,7 +454,7 @@ import 'sql/parts/query/common/query.contribution'; import 'sql/parts/query/editor/resultsGridContribution'; import 'sql/parts/profiler/contrib/profiler.contribution'; import 'sql/parts/profiler/contrib/profilerActions.contribution'; -import 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; +import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution'; import 'sql/platform/accounts/browser/accountManagement.contribution'; // dashboard