diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js index d2a0b0f59c..d8584a488f 100644 --- a/build/gulpfile.hygiene.js +++ b/build/gulpfile.hygiene.js @@ -139,26 +139,26 @@ const copyrightFilter = [ // {{SQL CARBON EDIT}} '!extensions/notebook/src/intellisense/text.ts', '!extensions/mssql/src/hdfs/webhdfs.ts', - '!src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts', - '!src/sql/workbench/parts/notebook/common/models/url.ts', - '!src/sql/workbench/parts/notebook/browser/models/renderMimeInterfaces.ts', - '!src/sql/workbench/parts/notebook/browser/models/outputProcessor.ts', - '!src/sql/workbench/parts/notebook/browser/models/mimemodel.ts', - '!src/sql/workbench/parts/notebook/browser/cellViews/media/*.css', + '!src/sql/workbench/contrib/notebook/browser/outputs/tableRenderers.ts', + '!src/sql/workbench/contrib/notebook/common/models/url.ts', + '!src/sql/workbench/contrib/notebook/browser/models/renderMimeInterfaces.ts', + '!src/sql/workbench/contrib/notebook/browser/models/outputProcessor.ts', + '!src/sql/workbench/contrib/notebook/browser/models/mimemodel.ts', + '!src/sql/workbench/contrib/notebook/browser/cellViews/media/*.css', '!src/sql/base/browser/ui/table/plugins/rowSelectionModel.plugin.ts', '!src/sql/base/browser/ui/table/plugins/rowDetailView.ts', '!src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts', '!src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts', '!src/sql/base/browser/ui/table/plugins/cellSelectionModel.plugin.ts', '!src/sql/base/browser/ui/table/plugins/autoSizeColumns.plugin.ts', - '!src/sql/workbench/parts/notebook/browser/outputs/sanitizer.ts', - '!src/sql/workbench/parts/notebook/browser/outputs/renderers.ts', - '!src/sql/workbench/parts/notebook/browser/outputs/registry.ts', - '!src/sql/workbench/parts/notebook/browser/outputs/factories.ts', - '!src/sql/workbench/parts/notebook/common/models/nbformat.ts', + '!src/sql/workbench/contrib/notebook/browser/outputs/sanitizer.ts', + '!src/sql/workbench/contrib/notebook/browser/outputs/renderers.ts', + '!src/sql/workbench/contrib/notebook/browser/outputs/registry.ts', + '!src/sql/workbench/contrib/notebook/browser/outputs/factories.ts', + '!src/sql/workbench/contrib/notebook/common/models/nbformat.ts', '!extensions/markdown-language-features/media/tomorrow.css', '!src/sql/workbench/browser/modelComponents/media/highlight.css', - '!src/sql/workbench/parts/notebook/electron-browser/cellViews/media/highlight.css', + '!src/sql/workbench/contrib/notebook/electron-browser/cellViews/media/highlight.css', '!extensions/mssql/sqltoolsservice/**', '!extensions/import/flatfileimportservice/**', '!extensions/notebook/src/prompts/**', diff --git a/src/sql/platform/dashboard/browser/insightRegistry.ts b/src/sql/platform/dashboard/browser/insightRegistry.ts index 5f1b8257f2..00e9a988a8 100644 --- a/src/sql/platform/dashboard/browser/insightRegistry.ts +++ b/src/sql/platform/dashboard/browser/insightRegistry.ts @@ -7,7 +7,7 @@ import { Type } from '@angular/core'; import * as platform from 'vs/platform/registry/common/platform'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { IInsightData } from 'sql/workbench/parts/charts/browser/interfaces'; +import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; import { values } from 'vs/base/common/collections'; export type InsightIdentifier = string; diff --git a/src/sql/platform/jobManagement/browser/jobActions.ts b/src/sql/platform/jobManagement/browser/jobActions.ts index 174d37d318..363ce59da1 100644 --- a/src/sql/platform/jobManagement/browser/jobActions.ts +++ b/src/sql/platform/jobManagement/browser/jobActions.ts @@ -8,19 +8,19 @@ import * as nls from 'vs/nls'; import * as azdata from 'azdata'; import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; -import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/browser/jobHistory.component'; +import { JobHistoryComponent } from 'sql/workbench/contrib/jobManagement/browser/jobHistory.component'; import { IJobManagementService } from '../common/interfaces'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/browser/jobsView.component'; -import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/browser/alertsView.component'; -import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/browser/operatorsView.component'; -import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/browser/proxiesView.component'; +import { JobsViewComponent } from 'sql/workbench/contrib/jobManagement/browser/jobsView.component'; +import { AlertsViewComponent } from 'sql/workbench/contrib/jobManagement/browser/alertsView.component'; +import { OperatorsViewComponent } from 'sql/workbench/contrib/jobManagement/browser/operatorsView.component'; +import { ProxiesViewComponent } from 'sql/workbench/contrib/jobManagement/browser/proxiesView.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { JobManagementView } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; -import { NotebooksViewComponent } from 'sql/workbench/parts/jobManagement/browser/notebooksView.component'; +import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; +import { NotebooksViewComponent } from 'sql/workbench/contrib/jobManagement/browser/notebooksView.component'; export const successLabel: string = nls.localize('jobaction.successLabel', "Success"); export const errorLabel: string = nls.localize('jobaction.faillabel', "Error"); diff --git a/src/sql/platform/query/common/gridDataProvider.ts b/src/sql/platform/query/common/gridDataProvider.ts index 8d9b8b12fb..6976a8c037 100644 --- a/src/sql/platform/query/common/gridDataProvider.ts +++ b/src/sql/platform/query/common/gridDataProvider.ts @@ -5,7 +5,7 @@ import * as azdata from 'azdata'; import * as types from 'vs/base/common/types'; -import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; +import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; export interface IGridDataProvider { diff --git a/src/sql/platform/query/common/queryModel.ts b/src/sql/platform/query/common/queryModel.ts index 51d299c6aa..139e3d27ba 100644 --- a/src/sql/platform/query/common/queryModel.ts +++ b/src/sql/platform/query/common/queryModel.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import QueryRunner, { IQueryMessage } from 'sql/platform/query/common/queryRunner'; -import { DataService } from 'sql/workbench/parts/grid/common/dataService'; +import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { ISelectionData, ResultSetSubset, diff --git a/src/sql/platform/query/common/queryModelService.ts b/src/sql/platform/query/common/queryModelService.ts index a4770cdec2..9ea1d218dc 100644 --- a/src/sql/platform/query/common/queryModelService.ts +++ b/src/sql/platform/query/common/queryModelService.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents'; -import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants'; +import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents'; +import * as LocalizedConstants from 'sql/workbench/contrib/query/common/localizedConstants'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { DataService } from 'sql/workbench/parts/grid/common/dataService'; +import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import * as azdata from 'azdata'; diff --git a/src/sql/platform/query/common/queryRunner.ts b/src/sql/platform/query/common/queryRunner.ts index 26419537dc..4f850cc890 100644 --- a/src/sql/platform/query/common/queryRunner.ts +++ b/src/sql/platform/query/common/queryRunner.ts @@ -7,10 +7,10 @@ import * as azdata from 'azdata'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import * as Utils from 'sql/platform/connection/common/utils'; -import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; +import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import { Deferred } from 'sql/base/common/promise'; import { IQueryPlanInfo } from 'sql/platform/query/common/queryModel'; -import { ResultSerializer } from 'sql/workbench/parts/query/common/resultSerializer'; +import { ResultSerializer } from 'sql/workbench/contrib/query/common/resultSerializer'; import Severity from 'vs/base/common/severity'; import * as nls from 'vs/nls'; diff --git a/src/sql/platform/restore/browser/restoreServiceImpl.ts b/src/sql/platform/restore/browser/restoreServiceImpl.ts index b747941180..bdf7273314 100644 --- a/src/sql/platform/restore/browser/restoreServiceImpl.ts +++ b/src/sql/platform/restore/browser/restoreServiceImpl.ts @@ -9,7 +9,7 @@ import * as azdata from 'azdata'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; -import { RestoreDialog } from 'sql/workbench/parts/restore/browser/restoreDialog'; +import { RestoreDialog } from 'sql/workbench/contrib/restore/browser/restoreDialog'; import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/api/browser/mainThreadModalDialog.ts b/src/sql/workbench/api/browser/mainThreadModalDialog.ts index 015daec03a..94d88e2114 100644 --- a/src/sql/workbench/api/browser/mainThreadModalDialog.ts +++ b/src/sql/workbench/api/browser/mainThreadModalDialog.ts @@ -5,7 +5,7 @@ import 'vs/css!sql/media/icons/common-icons'; -import { WebViewDialog } from 'sql/workbench/parts/webview/browser/webViewDialog'; +import { WebViewDialog } from 'sql/workbench/contrib/webview/browser/webViewDialog'; import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; diff --git a/src/sql/workbench/api/browser/mainThreadNotebook.ts b/src/sql/workbench/api/browser/mainThreadNotebook.ts index 71a54cdd84..ead712bf1c 100644 --- a/src/sql/workbench/api/browser/mainThreadNotebook.ts +++ b/src/sql/workbench/api/browser/mainThreadNotebook.ts @@ -15,7 +15,7 @@ import { INotebookService, INotebookProvider, INotebookManager } from 'sql/workb import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, FutureMessageType, INotebookFutureDetails, INotebookFutureDone } from 'sql/workbench/api/common/sqlExtHostTypes'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; import { Deferred } from 'sql/base/common/promise'; -import { FutureInternal } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { FutureInternal } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @extHostNamedCustomer(SqlMainContext.MainThreadNotebook) diff --git a/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts index 5b79810506..5ff1124ed5 100644 --- a/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts @@ -20,12 +20,12 @@ import { SqlMainContext, MainThreadNotebookDocumentsAndEditorsShape, SqlExtHostContext, ExtHostNotebookDocumentsAndEditorsShape, INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData } from 'sql/workbench/api/common/sqlExtHost.protocol'; -import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; +import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/browser/notebookService'; import { ISingleNotebookEditOperation, NotebookChangeKind } from 'sql/workbench/api/common/sqlExtHostTypes'; import { disposed } from 'vs/base/common/errors'; -import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookChangeType, CellTypes } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; diff --git a/src/sql/workbench/api/browser/mainThreadQueryEditor.ts b/src/sql/workbench/api/browser/mainThreadQueryEditor.ts index 0043828bc6..0b77ffb937 100644 --- a/src/sql/workbench/api/browser/mainThreadQueryEditor.ts +++ b/src/sql/workbench/api/browser/mainThreadQueryEditor.ts @@ -7,7 +7,7 @@ import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQ import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; -import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; +import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Disposable } from 'vs/base/common/lifecycle'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; diff --git a/src/sql/workbench/api/common/extHostNotebookEditor.ts b/src/sql/workbench/api/common/extHostNotebookEditor.ts index 7f981e98ed..1f7802ed93 100644 --- a/src/sql/workbench/api/common/extHostNotebookEditor.ts +++ b/src/sql/workbench/api/common/extHostNotebookEditor.ts @@ -13,7 +13,7 @@ import { readonly } from 'vs/base/common/errors'; import { MainThreadNotebookDocumentsAndEditorsShape } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { ExtHostNotebookDocumentData } from 'sql/workbench/api/common/extHostNotebookDocumentData'; import { CellRange, ISingleNotebookEditOperation, ICellRange } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { HideInputTag } from 'sql/workbench/parts/notebook/browser/models/cell'; +import { HideInputTag } from 'sql/workbench/contrib/notebook/browser/models/cell'; import { find } from 'vs/base/common/arrays'; export interface INotebookEditOperation { diff --git a/src/sql/workbench/browser/customInputConverter.ts b/src/sql/workbench/browser/customInputConverter.ts index 0aac0e7629..486ea1ba96 100644 --- a/src/sql/workbench/browser/customInputConverter.ts +++ b/src/sql/workbench/browser/customInputConverter.ts @@ -8,11 +8,11 @@ import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiat import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; import { URI } from 'vs/base/common/uri'; -import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; -import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; -import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; +import { QueryPlanInput } from 'sql/workbench/contrib/queryPlan/common/queryPlanInput'; +import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput'; diff --git a/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts b/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts index 5a2d3c9b43..cf678f86c1 100644 --- a/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts +++ b/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts @@ -8,7 +8,7 @@ import { ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, ComponentRef } from '@angular/core'; -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { IComponent, IComponentConfig, IComponentDescriptor, IModelStore, COMPONENT_CONFIG } from './interfaces'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry'; diff --git a/src/sql/workbench/browser/parts/views/customView.ts b/src/sql/workbench/browser/parts/views/customView.ts index 2ec10a7c03..d576d4599c 100644 --- a/src/sql/workbench/browser/parts/views/customView.ts +++ b/src/sql/workbench/browser/parts/views/customView.ts @@ -46,8 +46,8 @@ import { FuzzyScore, createMatches } from 'vs/base/common/filters'; import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults'; import { ITreeItem, ITreeView } from 'sql/workbench/common/views'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; -import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; +import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim'; +import { NodeContextKey } from 'sql/workbench/contrib/dataExplorer/browser/nodeContext'; import { UserCancelledConnectionError } from 'sql/base/common/errors'; import { firstIndex } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/browser/taskUtilities.ts b/src/sql/workbench/browser/taskUtilities.ts index 6dd286b18c..3007e1510d 100644 --- a/src/sql/workbench/browser/taskUtilities.ts +++ b/src/sql/workbench/browser/taskUtilities.ts @@ -9,12 +9,12 @@ import { IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode, IConnectionResult } from 'sql/platform/connection/common/connectionManagement'; -import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput'; +import { EditDataInput } from 'sql/workbench/contrib/editData/browser/editDataInput'; import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; -import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; +import { DashboardInput } from 'sql/workbench/contrib/dashboard/browser/dashboardInput'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; diff --git a/src/sql/workbench/common/sqlWorkbenchUtils.ts b/src/sql/workbench/common/sqlWorkbenchUtils.ts index 34458b222e..a4ed002385 100644 --- a/src/sql/workbench/common/sqlWorkbenchUtils.ts +++ b/src/sql/workbench/common/sqlWorkbenchUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as ConnectionConstants from 'sql/platform/connection/common/constants'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/workbench/parts/accounts/browser/accountDialog.ts b/src/sql/workbench/contrib/accounts/browser/accountDialog.ts similarity index 99% rename from src/sql/workbench/parts/accounts/browser/accountDialog.ts rename to src/sql/workbench/contrib/accounts/browser/accountDialog.ts index 63465f28e3..af2ac65063 100644 --- a/src/sql/workbench/parts/accounts/browser/accountDialog.ts +++ b/src/sql/workbench/contrib/accounts/browser/accountDialog.ts @@ -28,7 +28,7 @@ import { Modal } from 'sql/workbench/browser/modal/modal'; import { attachModalDialogStyler, attachButtonStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel'; import { AddAccountAction } from 'sql/platform/accounts/common/accountActions'; -import { AccountListRenderer, AccountListDelegate } from 'sql/workbench/parts/accounts/browser/accountListRenderer'; +import { AccountListRenderer, AccountListDelegate } from 'sql/workbench/contrib/accounts/browser/accountListRenderer'; import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; diff --git a/src/sql/workbench/parts/accounts/browser/accountDialogController.ts b/src/sql/workbench/contrib/accounts/browser/accountDialogController.ts similarity index 95% rename from src/sql/workbench/parts/accounts/browser/accountDialogController.ts rename to src/sql/workbench/contrib/accounts/browser/accountDialogController.ts index d0eb3bf6af..2c613d745b 100644 --- a/src/sql/workbench/parts/accounts/browser/accountDialogController.ts +++ b/src/sql/workbench/contrib/accounts/browser/accountDialogController.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import Severity from 'vs/base/common/severity'; -import { AccountDialog } from 'sql/workbench/parts/accounts/browser/accountDialog'; +import { AccountDialog } from 'sql/workbench/contrib/accounts/browser/accountDialog'; import { localize } from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/workbench/parts/accounts/browser/accountListRenderer.ts b/src/sql/workbench/contrib/accounts/browser/accountListRenderer.ts similarity index 100% rename from src/sql/workbench/parts/accounts/browser/accountListRenderer.ts rename to src/sql/workbench/contrib/accounts/browser/accountListRenderer.ts diff --git a/src/sql/workbench/parts/accounts/browser/accountManagement.contribution.ts b/src/sql/workbench/contrib/accounts/browser/accountManagement.contribution.ts similarity index 100% rename from src/sql/workbench/parts/accounts/browser/accountManagement.contribution.ts rename to src/sql/workbench/contrib/accounts/browser/accountManagement.contribution.ts diff --git a/src/sql/workbench/parts/accounts/browser/accountPicker.ts b/src/sql/workbench/contrib/accounts/browser/accountPicker.ts similarity index 100% rename from src/sql/workbench/parts/accounts/browser/accountPicker.ts rename to src/sql/workbench/contrib/accounts/browser/accountPicker.ts diff --git a/src/sql/workbench/parts/accounts/browser/accountPickerImpl.ts b/src/sql/workbench/contrib/accounts/browser/accountPickerImpl.ts similarity index 99% rename from src/sql/workbench/parts/accounts/browser/accountPickerImpl.ts rename to src/sql/workbench/contrib/accounts/browser/accountPickerImpl.ts index b472540f71..7d99f34b6c 100644 --- a/src/sql/workbench/parts/accounts/browser/accountPickerImpl.ts +++ b/src/sql/workbench/contrib/accounts/browser/accountPickerImpl.ts @@ -21,7 +21,7 @@ import * as azdata from 'azdata'; import { DropdownList } from 'sql/base/browser/ui/dropdownList/dropdownList'; import { attachDropdownStyler } from 'sql/platform/theme/common/styler'; import { AddAccountAction, RefreshAccountAction } from 'sql/platform/accounts/common/accountActions'; -import { AccountPickerListRenderer, AccountListDelegate } from 'sql/workbench/parts/accounts/browser/accountListRenderer'; +import { AccountPickerListRenderer, AccountListDelegate } from 'sql/workbench/contrib/accounts/browser/accountListRenderer'; import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel'; import { firstIndex } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/accounts/browser/accountPickerService.ts b/src/sql/workbench/contrib/accounts/browser/accountPickerService.ts similarity index 93% rename from src/sql/workbench/parts/accounts/browser/accountPickerService.ts rename to src/sql/workbench/contrib/accounts/browser/accountPickerService.ts index c912a87d18..0bf8f4208c 100644 --- a/src/sql/workbench/parts/accounts/browser/accountPickerService.ts +++ b/src/sql/workbench/contrib/accounts/browser/accountPickerService.ts @@ -7,8 +7,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { Event, Emitter } from 'vs/base/common/event'; import * as azdata from 'azdata'; -import { IAccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPicker'; -import { AccountPicker } from 'sql/workbench/parts/accounts/browser/accountPickerImpl'; +import { IAccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPicker'; +import { AccountPicker } from 'sql/workbench/contrib/accounts/browser/accountPickerImpl'; export class AccountPickerService implements IAccountPickerService { _serviceBrand: undefined; diff --git a/src/sql/workbench/parts/accounts/browser/accounts.contribution.ts b/src/sql/workbench/contrib/accounts/browser/accounts.contribution.ts similarity index 100% rename from src/sql/workbench/parts/accounts/browser/accounts.contribution.ts rename to src/sql/workbench/contrib/accounts/browser/accounts.contribution.ts diff --git a/src/sql/workbench/parts/accounts/browser/autoOAuthDialog.ts b/src/sql/workbench/contrib/accounts/browser/autoOAuthDialog.ts similarity index 100% rename from src/sql/workbench/parts/accounts/browser/autoOAuthDialog.ts rename to src/sql/workbench/contrib/accounts/browser/autoOAuthDialog.ts diff --git a/src/sql/workbench/parts/accounts/browser/autoOAuthDialogController.ts b/src/sql/workbench/contrib/accounts/browser/autoOAuthDialogController.ts similarity index 97% rename from src/sql/workbench/parts/accounts/browser/autoOAuthDialogController.ts rename to src/sql/workbench/contrib/accounts/browser/autoOAuthDialogController.ts index ce5d7cac74..c8ccdd6806 100644 --- a/src/sql/workbench/parts/accounts/browser/autoOAuthDialogController.ts +++ b/src/sql/workbench/contrib/accounts/browser/autoOAuthDialogController.ts @@ -7,7 +7,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import Severity from 'vs/base/common/severity'; import { localize } from 'vs/nls'; -import { AutoOAuthDialog } from 'sql/workbench/parts/accounts/browser/autoOAuthDialog'; +import { AutoOAuthDialog } from 'sql/workbench/contrib/accounts/browser/autoOAuthDialog'; import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/workbench/parts/accounts/browser/firewallRuleDialog.ts b/src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts similarity index 99% rename from src/sql/workbench/parts/accounts/browser/firewallRuleDialog.ts rename to src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts index 6a73b0878f..8e42be46c3 100644 --- a/src/sql/workbench/parts/accounts/browser/firewallRuleDialog.ts +++ b/src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts @@ -24,7 +24,7 @@ import { Modal } from 'sql/workbench/browser/modal/modal'; import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel'; import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import { IAccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPicker'; +import { IAccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPicker'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; diff --git a/src/sql/workbench/parts/accounts/browser/firewallRuleDialogController.ts b/src/sql/workbench/contrib/accounts/browser/firewallRuleDialogController.ts similarity index 97% rename from src/sql/workbench/parts/accounts/browser/firewallRuleDialogController.ts rename to src/sql/workbench/contrib/accounts/browser/firewallRuleDialogController.ts index 3d0a3985a1..f476e8b1f9 100644 --- a/src/sql/workbench/parts/accounts/browser/firewallRuleDialogController.ts +++ b/src/sql/workbench/contrib/accounts/browser/firewallRuleDialogController.ts @@ -9,7 +9,7 @@ import { localize } from 'vs/nls'; import * as azdata from 'azdata'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { FirewallRuleDialog } from 'sql/workbench/parts/accounts/browser/firewallRuleDialog'; +import { FirewallRuleDialog } from 'sql/workbench/contrib/accounts/browser/firewallRuleDialog'; import { IAccountManagementService, AzureResource } from 'sql/platform/accounts/common/interfaces'; import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { Deferred } from 'sql/base/common/promise'; diff --git a/src/sql/workbench/parts/accounts/browser/media/accountActions.css b/src/sql/workbench/contrib/accounts/browser/media/accountActions.css similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/accountActions.css rename to src/sql/workbench/contrib/accounts/browser/media/accountActions.css diff --git a/src/sql/workbench/parts/accounts/browser/media/accountDialog.css b/src/sql/workbench/contrib/accounts/browser/media/accountDialog.css similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/accountDialog.css rename to src/sql/workbench/contrib/accounts/browser/media/accountDialog.css diff --git a/src/sql/workbench/parts/accounts/browser/media/accountListRenderer.css b/src/sql/workbench/contrib/accounts/browser/media/accountListRenderer.css similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/accountListRenderer.css rename to src/sql/workbench/contrib/accounts/browser/media/accountListRenderer.css diff --git a/src/sql/workbench/parts/accounts/browser/media/accountListStatusbarItem.css b/src/sql/workbench/contrib/accounts/browser/media/accountListStatusbarItem.css similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/accountListStatusbarItem.css rename to src/sql/workbench/contrib/accounts/browser/media/accountListStatusbarItem.css diff --git a/src/sql/workbench/parts/accounts/browser/media/accountPicker.css b/src/sql/workbench/contrib/accounts/browser/media/accountPicker.css similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/accountPicker.css rename to src/sql/workbench/contrib/accounts/browser/media/accountPicker.css diff --git a/src/sql/workbench/parts/accounts/browser/media/accounts_statusbar_inverse.svg b/src/sql/workbench/contrib/accounts/browser/media/accounts_statusbar_inverse.svg similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/accounts_statusbar_inverse.svg rename to src/sql/workbench/contrib/accounts/browser/media/accounts_statusbar_inverse.svg diff --git a/src/sql/workbench/parts/accounts/browser/media/autoOAuthDialog.css b/src/sql/workbench/contrib/accounts/browser/media/autoOAuthDialog.css similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/autoOAuthDialog.css rename to src/sql/workbench/contrib/accounts/browser/media/autoOAuthDialog.css diff --git a/src/sql/workbench/parts/accounts/browser/media/firewallRuleDialog.css b/src/sql/workbench/contrib/accounts/browser/media/firewallRuleDialog.css similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/firewallRuleDialog.css rename to src/sql/workbench/contrib/accounts/browser/media/firewallRuleDialog.css diff --git a/src/sql/workbench/parts/accounts/browser/media/new_account.svg b/src/sql/workbench/contrib/accounts/browser/media/new_account.svg similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/new_account.svg rename to src/sql/workbench/contrib/accounts/browser/media/new_account.svg diff --git a/src/sql/workbench/parts/accounts/browser/media/new_account_inverse.svg b/src/sql/workbench/contrib/accounts/browser/media/new_account_inverse.svg similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/new_account_inverse.svg rename to src/sql/workbench/contrib/accounts/browser/media/new_account_inverse.svg diff --git a/src/sql/workbench/parts/accounts/browser/media/secure.svg b/src/sql/workbench/contrib/accounts/browser/media/secure.svg similarity index 100% rename from src/sql/workbench/parts/accounts/browser/media/secure.svg rename to src/sql/workbench/contrib/accounts/browser/media/secure.svg diff --git a/src/sql/workbench/parts/accounts/test/browser/accountDialogController.test.ts b/src/sql/workbench/contrib/accounts/test/browser/accountDialogController.test.ts similarity index 94% rename from src/sql/workbench/parts/accounts/test/browser/accountDialogController.test.ts rename to src/sql/workbench/contrib/accounts/test/browser/accountDialogController.test.ts index c23c25dd43..01f457469f 100644 --- a/src/sql/workbench/parts/accounts/test/browser/accountDialogController.test.ts +++ b/src/sql/workbench/contrib/accounts/test/browser/accountDialogController.test.ts @@ -6,13 +6,13 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import { Emitter } from 'vs/base/common/event'; -import { AccountDialog } from 'sql/workbench/parts/accounts/browser/accountDialog'; -import { AccountDialogController } from 'sql/workbench/parts/accounts/browser/accountDialogController'; +import { AccountDialog } from 'sql/workbench/contrib/accounts/browser/accountDialog'; +import { AccountDialogController } from 'sql/workbench/contrib/accounts/browser/accountDialogController'; import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel'; import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService'; import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; -import { AccountListRenderer } from 'sql/workbench/parts/accounts/browser/accountListRenderer'; +import { AccountListRenderer } from 'sql/workbench/contrib/accounts/browser/accountListRenderer'; import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService'; // TESTS /////////////////////////////////////////////////////////////////// diff --git a/src/sql/workbench/parts/accounts/test/browser/accountPickerService.test.ts b/src/sql/workbench/contrib/accounts/test/browser/accountPickerService.test.ts similarity index 96% rename from src/sql/workbench/parts/accounts/test/browser/accountPickerService.test.ts rename to src/sql/workbench/contrib/accounts/test/browser/accountPickerService.test.ts index 6ba950a465..3e73d94c6d 100644 --- a/src/sql/workbench/parts/accounts/test/browser/accountPickerService.test.ts +++ b/src/sql/workbench/contrib/accounts/test/browser/accountPickerService.test.ts @@ -8,8 +8,8 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import { EventVerifierSingle } from 'sql/base/test/common/event'; import { Emitter } from 'vs/base/common/event'; -import { AccountPicker } from 'sql/workbench/parts/accounts/browser/accountPickerImpl'; -import { AccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPickerService'; +import { AccountPicker } from 'sql/workbench/contrib/accounts/browser/accountPickerImpl'; +import { AccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPickerService'; import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel'; import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; diff --git a/src/sql/workbench/parts/accounts/test/browser/autoOAuthDialogController.test.ts b/src/sql/workbench/contrib/accounts/test/browser/autoOAuthDialogController.test.ts similarity index 97% rename from src/sql/workbench/parts/accounts/test/browser/autoOAuthDialogController.test.ts rename to src/sql/workbench/contrib/accounts/test/browser/autoOAuthDialogController.test.ts index c92d9bb460..e866fd8579 100644 --- a/src/sql/workbench/parts/accounts/test/browser/autoOAuthDialogController.test.ts +++ b/src/sql/workbench/contrib/accounts/test/browser/autoOAuthDialogController.test.ts @@ -7,8 +7,8 @@ import * as TypeMoq from 'typemoq'; import { Emitter } from 'vs/base/common/event'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; -import { AutoOAuthDialog } from 'sql/workbench/parts/accounts/browser/autoOAuthDialog'; -import { AutoOAuthDialogController } from 'sql/workbench/parts/accounts/browser/autoOAuthDialogController'; +import { AutoOAuthDialog } from 'sql/workbench/contrib/accounts/browser/autoOAuthDialog'; +import { AutoOAuthDialogController } from 'sql/workbench/contrib/accounts/browser/autoOAuthDialogController'; import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService'; import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService'; import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService'; diff --git a/src/sql/workbench/parts/accounts/test/browser/firewallRuleDialogController.test.ts b/src/sql/workbench/contrib/accounts/test/browser/firewallRuleDialogController.test.ts similarity index 98% rename from src/sql/workbench/parts/accounts/test/browser/firewallRuleDialogController.test.ts rename to src/sql/workbench/contrib/accounts/test/browser/firewallRuleDialogController.test.ts index 2288dbb456..7a4d4e7244 100644 --- a/src/sql/workbench/parts/accounts/test/browser/firewallRuleDialogController.test.ts +++ b/src/sql/workbench/contrib/accounts/test/browser/firewallRuleDialogController.test.ts @@ -7,9 +7,9 @@ import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import { Emitter } from 'vs/base/common/event'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { FirewallRuleDialog } from 'sql/workbench/parts/accounts/browser/firewallRuleDialog'; +import { FirewallRuleDialog } from 'sql/workbench/contrib/accounts/browser/firewallRuleDialog'; import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel'; -import { FirewallRuleDialogController } from 'sql/workbench/parts/accounts/browser/firewallRuleDialogController'; +import { FirewallRuleDialogController } from 'sql/workbench/contrib/accounts/browser/firewallRuleDialogController'; import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService'; import { TestResourceProvider } from 'sql/workbench/services/resourceProvider/test/common/testResourceProviderService'; import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService'; diff --git a/src/sql/workbench/parts/backup/browser/backup.component.html b/src/sql/workbench/contrib/backup/browser/backup.component.html similarity index 100% rename from src/sql/workbench/parts/backup/browser/backup.component.html rename to src/sql/workbench/contrib/backup/browser/backup.component.html diff --git a/src/sql/workbench/parts/backup/browser/backup.component.ts b/src/sql/workbench/contrib/backup/browser/backup.component.ts similarity index 99% rename from src/sql/workbench/parts/backup/browser/backup.component.ts rename to src/sql/workbench/contrib/backup/browser/backup.component.ts index 91b89e57b0..510379fc96 100644 --- a/src/sql/workbench/parts/backup/browser/backup.component.ts +++ b/src/sql/workbench/contrib/backup/browser/backup.component.ts @@ -13,7 +13,7 @@ import { ListBox } from 'sql/base/browser/ui/listBox/listBox'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachButtonStyler, attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import * as BackupConstants from 'sql/workbench/parts/backup/common/constants'; +import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants'; import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/workbench/parts/backup/browser/backup.contribution.ts b/src/sql/workbench/contrib/backup/browser/backup.contribution.ts similarity index 81% rename from src/sql/workbench/parts/backup/browser/backup.contribution.ts rename to src/sql/workbench/contrib/backup/browser/backup.contribution.ts index f21f4fcade..aa3bd7e848 100644 --- a/src/sql/workbench/parts/backup/browser/backup.contribution.ts +++ b/src/sql/workbench/contrib/backup/browser/backup.contribution.ts @@ -5,19 +5,19 @@ import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; -import { BackupAction } from 'sql/workbench/parts/backup/browser/backupActions'; +import { BackupAction } from 'sql/workbench/contrib/backup/browser/backupActions'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { ManageActionContext } from 'sql/workbench/browser/actions'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { localize } from 'vs/nls'; -import { OEAction } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; -import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; -import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey'; +import { OEAction } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; +import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; +import { ServerInfoContextKey } from 'sql/workbench/contrib/connection/common/serverInfoContextKey'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes'; diff --git a/src/sql/workbench/parts/backup/browser/backup.module.ts b/src/sql/workbench/contrib/backup/browser/backup.module.ts similarity index 95% rename from src/sql/workbench/parts/backup/browser/backup.module.ts rename to src/sql/workbench/contrib/backup/browser/backup.module.ts index e1585e2df0..7236a3e281 100644 --- a/src/sql/workbench/parts/backup/browser/backup.module.ts +++ b/src/sql/workbench/contrib/backup/browser/backup.module.ts @@ -12,7 +12,7 @@ import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; -import { BackupComponent } from 'sql/workbench/parts/backup/browser/backup.component'; +import { BackupComponent } from 'sql/workbench/contrib/backup/browser/backup.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; diff --git a/src/sql/workbench/parts/backup/browser/backupActions.ts b/src/sql/workbench/contrib/backup/browser/backupActions.ts similarity index 100% rename from src/sql/workbench/parts/backup/browser/backupActions.ts rename to src/sql/workbench/contrib/backup/browser/backupActions.ts diff --git a/src/sql/workbench/parts/backup/browser/backupDialog.ts b/src/sql/workbench/contrib/backup/browser/backupDialog.ts similarity index 95% rename from src/sql/workbench/parts/backup/browser/backupDialog.ts rename to src/sql/workbench/contrib/backup/browser/backupDialog.ts index 168e7f8bd4..48897def6c 100644 --- a/src/sql/workbench/parts/backup/browser/backupDialog.ts +++ b/src/sql/workbench/contrib/backup/browser/backupDialog.ts @@ -5,8 +5,8 @@ import { Modal } from 'sql/workbench/browser/modal/modal'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { BackupModule } from 'sql/workbench/parts/backup/browser/backup.module'; -import { BACKUP_SELECTOR } from 'sql/workbench/parts/backup/browser/backup.component'; +import { BackupModule } from 'sql/workbench/contrib/backup/browser/backup.module'; +import { BACKUP_SELECTOR } from 'sql/workbench/contrib/backup/browser/backup.component'; import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; diff --git a/src/sql/workbench/parts/backup/browser/media/backupDialog.css b/src/sql/workbench/contrib/backup/browser/media/backupDialog.css similarity index 100% rename from src/sql/workbench/parts/backup/browser/media/backupDialog.css rename to src/sql/workbench/contrib/backup/browser/media/backupDialog.css diff --git a/src/sql/workbench/parts/backup/common/constants.ts b/src/sql/workbench/contrib/backup/common/constants.ts similarity index 100% rename from src/sql/workbench/parts/backup/common/constants.ts rename to src/sql/workbench/contrib/backup/common/constants.ts diff --git a/src/sql/workbench/parts/charts/browser/actions.ts b/src/sql/workbench/contrib/charts/browser/actions.ts similarity index 95% rename from src/sql/workbench/parts/charts/browser/actions.ts rename to src/sql/workbench/contrib/charts/browser/actions.ts index c16f110b69..e32ee49c0a 100644 --- a/src/sql/workbench/parts/charts/browser/actions.ts +++ b/src/sql/workbench/contrib/charts/browser/actions.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IInsight } from 'sql/workbench/parts/charts/browser/interfaces'; -import { Graph } from 'sql/workbench/parts/charts/browser/graphInsight'; +import { IInsight } from 'sql/workbench/contrib/charts/browser/interfaces'; +import { Graph } from 'sql/workbench/contrib/charts/browser/graphInsight'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { localize } from 'vs/nls'; @@ -13,9 +13,9 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/ import { URI } from 'vs/base/common/uri'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; -import { IInsightOptions } from 'sql/workbench/parts/charts/common/interfaces'; +import { IInsightOptions } from 'sql/workbench/contrib/charts/common/interfaces'; import { IFileService } from 'vs/platform/files/common/files'; import { IFileDialogService, FileFilter } from 'vs/platform/dialogs/common/dialogs'; import { VSBuffer } from 'vs/base/common/buffer'; diff --git a/src/sql/workbench/parts/charts/browser/chartOptions.ts b/src/sql/workbench/contrib/charts/browser/chartOptions.ts similarity index 98% rename from src/sql/workbench/parts/charts/browser/chartOptions.ts rename to src/sql/workbench/contrib/charts/browser/chartOptions.ts index 0398e36c2c..19f3787827 100644 --- a/src/sql/workbench/parts/charts/browser/chartOptions.ts +++ b/src/sql/workbench/contrib/charts/browser/chartOptions.ts @@ -7,7 +7,7 @@ import { localize } from 'vs/nls'; import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry'; -import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/parts/charts/common/interfaces'; +import { IInsightOptions, DataDirection, DataType, LegendPosition, ChartType, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; import { values } from 'vs/base/common/collections'; const insightRegistry = Registry.as(Extensions.InsightContribution); diff --git a/src/sql/workbench/parts/charts/browser/chartTab.ts b/src/sql/workbench/contrib/charts/browser/chartTab.ts similarity index 100% rename from src/sql/workbench/parts/charts/browser/chartTab.ts rename to src/sql/workbench/contrib/charts/browser/chartTab.ts diff --git a/src/sql/workbench/parts/charts/browser/chartView.ts b/src/sql/workbench/contrib/charts/browser/chartView.ts similarity index 99% rename from src/sql/workbench/parts/charts/browser/chartView.ts rename to src/sql/workbench/contrib/charts/browser/chartView.ts index 3e5d36994a..c5d812b375 100644 --- a/src/sql/workbench/parts/charts/browser/chartView.ts +++ b/src/sql/workbench/contrib/charts/browser/chartView.ts @@ -21,10 +21,10 @@ import { attachSelectBoxStyler, attachInputBoxStyler } from 'vs/platform/theme/c import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { isUndefinedOrNull } from 'vs/base/common/types'; -import { CreateInsightAction, CopyAction, SaveImageAction, IChartActionContext } from 'sql/workbench/parts/charts/browser/actions'; +import { CreateInsightAction, CopyAction, SaveImageAction, IChartActionContext } from 'sql/workbench/contrib/charts/browser/actions'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox'; -import { ChartState, IInsightOptions, ChartType } from 'sql/workbench/parts/charts/common/interfaces'; +import { ChartState, IInsightOptions, ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; import * as nls from 'vs/nls'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/charts/browser/countInsight.ts b/src/sql/workbench/contrib/charts/browser/countInsight.ts similarity index 94% rename from src/sql/workbench/parts/charts/browser/countInsight.ts rename to src/sql/workbench/contrib/charts/browser/countInsight.ts index 2236989254..9615e0a5e0 100644 --- a/src/sql/workbench/parts/charts/browser/countInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/countInsight.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/countInsight'; import { IInsight, IInsightData } from './interfaces'; import { $, clearNode } from 'vs/base/browser/dom'; -import { InsightType } from 'sql/workbench/parts/charts/common/interfaces'; +import { InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; export class CountInsight implements IInsight { public options; diff --git a/src/sql/workbench/parts/charts/browser/graphInsight.ts b/src/sql/workbench/contrib/charts/browser/graphInsight.ts similarity index 99% rename from src/sql/workbench/parts/charts/browser/graphInsight.ts rename to src/sql/workbench/contrib/charts/browser/graphInsight.ts index b0f192616a..c0ade16a30 100644 --- a/src/sql/workbench/parts/charts/browser/graphInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/graphInsight.ts @@ -12,7 +12,7 @@ import { editorLineNumbers } from 'vs/editor/common/view/editorColorRegistry'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import { IInsight, IInsightData, IPointDataSet, customMixin } from './interfaces'; -import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/charts/common/interfaces'; +import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/contrib/charts/common/interfaces'; import { values } from 'vs/base/common/collections'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/charts/browser/imageInsight.ts b/src/sql/workbench/contrib/charts/browser/imageInsight.ts similarity index 96% rename from src/sql/workbench/parts/charts/browser/imageInsight.ts rename to src/sql/workbench/contrib/charts/browser/imageInsight.ts index 672a86b218..9dc3f27f1b 100644 --- a/src/sql/workbench/parts/charts/browser/imageInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/imageInsight.ts @@ -7,7 +7,7 @@ import { IInsight, IInsightData } from './interfaces'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { $ } from 'vs/base/browser/dom'; import { mixin } from 'vs/base/common/objects'; -import { IInsightOptions, InsightType } from 'sql/workbench/parts/charts/common/interfaces'; +import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; import * as nls from 'vs/nls'; import { startsWith } from 'vs/base/common/strings'; diff --git a/src/sql/workbench/parts/charts/browser/insight.ts b/src/sql/workbench/contrib/charts/browser/insight.ts similarity index 98% rename from src/sql/workbench/parts/charts/browser/insight.ts rename to src/sql/workbench/contrib/charts/browser/insight.ts index 4aa08b0a15..ec6d870670 100644 --- a/src/sql/workbench/parts/charts/browser/insight.ts +++ b/src/sql/workbench/contrib/charts/browser/insight.ts @@ -12,7 +12,7 @@ import { CountInsight } from './countInsight'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Dimension, clearNode } from 'vs/base/browser/dom'; import { deepClone } from 'vs/base/common/objects'; -import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/parts/charts/common/interfaces'; +import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; import { find } from 'vs/base/common/arrays'; const defaultOptions: IInsightOptions = { diff --git a/src/sql/workbench/parts/charts/browser/interfaces.ts b/src/sql/workbench/contrib/charts/browser/interfaces.ts similarity index 97% rename from src/sql/workbench/parts/charts/browser/interfaces.ts rename to src/sql/workbench/contrib/charts/browser/interfaces.ts index cd9f341d26..6a62293b9b 100644 --- a/src/sql/workbench/parts/charts/browser/interfaces.ts +++ b/src/sql/workbench/contrib/charts/browser/interfaces.ts @@ -6,7 +6,7 @@ import { Dimension } from 'vs/base/browser/dom'; import { mixin } from 'sql/base/common/objects'; import * as types from 'vs/base/common/types'; -import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/parts/charts/common/interfaces'; +import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; export interface IPointDataSet { data: Array<{ x: number | string, y: number }>; diff --git a/src/sql/workbench/parts/charts/browser/media/chartView.css b/src/sql/workbench/contrib/charts/browser/media/chartView.css similarity index 100% rename from src/sql/workbench/parts/charts/browser/media/chartView.css rename to src/sql/workbench/contrib/charts/browser/media/chartView.css diff --git a/src/sql/workbench/parts/charts/browser/media/countInsight.css b/src/sql/workbench/contrib/charts/browser/media/countInsight.css similarity index 100% rename from src/sql/workbench/parts/charts/browser/media/countInsight.css rename to src/sql/workbench/contrib/charts/browser/media/countInsight.css diff --git a/src/sql/workbench/parts/charts/browser/media/images/invalidImage.png b/src/sql/workbench/contrib/charts/browser/media/images/invalidImage.png similarity index 100% rename from src/sql/workbench/parts/charts/browser/media/images/invalidImage.png rename to src/sql/workbench/contrib/charts/browser/media/images/invalidImage.png diff --git a/src/sql/workbench/parts/charts/browser/tableInsight.ts b/src/sql/workbench/contrib/charts/browser/tableInsight.ts similarity index 96% rename from src/sql/workbench/parts/charts/browser/tableInsight.ts rename to src/sql/workbench/contrib/charts/browser/tableInsight.ts index 97114a318f..f216cf4d35 100644 --- a/src/sql/workbench/parts/charts/browser/tableInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/tableInsight.ts @@ -12,7 +12,7 @@ import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelect import { $, Dimension } from 'vs/base/browser/dom'; import { Disposable } from 'vs/base/common/lifecycle'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { InsightType } from 'sql/workbench/parts/charts/common/interfaces'; +import { InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; export class TableInsight extends Disposable implements IInsight { public static readonly types = [InsightType.Table]; diff --git a/src/sql/workbench/parts/charts/common/interfaces.ts b/src/sql/workbench/contrib/charts/common/interfaces.ts similarity index 100% rename from src/sql/workbench/parts/charts/common/interfaces.ts rename to src/sql/workbench/contrib/charts/common/interfaces.ts diff --git a/src/sql/workbench/parts/charts/test/browser/chartView.test.ts b/src/sql/workbench/contrib/charts/test/browser/chartView.test.ts similarity index 95% rename from src/sql/workbench/parts/charts/test/browser/chartView.test.ts rename to src/sql/workbench/contrib/charts/test/browser/chartView.test.ts index d6a52aff8b..daefcbe1cb 100644 --- a/src/sql/workbench/parts/charts/test/browser/chartView.test.ts +++ b/src/sql/workbench/contrib/charts/test/browser/chartView.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { ChartView } from 'sql/workbench/parts/charts/browser/chartView'; +import { ChartView } from 'sql/workbench/contrib/charts/browser/chartView'; import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService'; import { TestLayoutService } from 'vs/workbench/test/workbenchTestServices'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; diff --git a/src/sql/workbench/parts/commandLine/electron-browser/commandLine.contribution.ts b/src/sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution.ts similarity index 94% rename from src/sql/workbench/parts/commandLine/electron-browser/commandLine.contribution.ts rename to src/sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution.ts index 4a7a89b603..ad8425a073 100644 --- a/src/sql/workbench/parts/commandLine/electron-browser/commandLine.contribution.ts +++ b/src/sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution.ts @@ -6,6 +6,6 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; -import { CommandLineWorkbenchContribution } from 'sql/workbench/parts/commandLine/electron-browser/commandLine'; +import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine'; Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(CommandLineWorkbenchContribution, LifecyclePhase.Restored); diff --git a/src/sql/workbench/parts/commandLine/electron-browser/commandLine.ts b/src/sql/workbench/contrib/commandLine/electron-browser/commandLine.ts similarity index 98% rename from src/sql/workbench/parts/commandLine/electron-browser/commandLine.ts rename to src/sql/workbench/contrib/commandLine/electron-browser/commandLine.ts index 0adc9e5abe..54eb2d807e 100644 --- a/src/sql/workbench/parts/commandLine/electron-browser/commandLine.ts +++ b/src/sql/workbench/contrib/commandLine/electron-browser/commandLine.ts @@ -13,20 +13,20 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment'; import * as Constants from 'sql/platform/connection/common/constants'; import * as platform from 'vs/platform/registry/common/platform'; -import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/contrib/connection/common/connectionProviderExtension'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { ipcRenderer as ipc } from 'electron'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { localize } from 'vs/nls'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { URI } from 'vs/base/common/uri'; import { ILogService } from 'vs/platform/log/common/log'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { openNewQuery } from 'sql/workbench/parts/query/browser/queryActions'; +import { openNewQuery } from 'sql/workbench/contrib/query/browser/queryActions'; import { IURLService, IURLHandler } from 'vs/platform/url/common/url'; import { getErrorMessage } from 'vs/base/common/errors'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; diff --git a/src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts b/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts similarity index 99% rename from src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts rename to src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts index 94a6bb8f7a..d23cd2a007 100644 --- a/src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts +++ b/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts @@ -8,7 +8,7 @@ import * as TypeMoq from 'typemoq'; import * as azdata from 'azdata'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; -import { CommandLineWorkbenchContribution } from 'sql/workbench/parts/commandLine/electron-browser/commandLine'; +import { CommandLineWorkbenchContribution } from 'sql/workbench/contrib/commandLine/electron-browser/commandLine'; import * as Constants from 'sql/platform/connection/common/constants'; import { ParsedArgs } from 'vs/platform/environment/common/environment'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; @@ -22,7 +22,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { assertThrowsAsync } from 'sql/base/test/common/async'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { TestEditorService, TestDialogService } from 'vs/workbench/test/workbenchTestServices'; -import { QueryInput, QueryEditorState } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput, QueryEditorState } from 'sql/workbench/contrib/query/common/queryInput'; import { URI } from 'vs/base/common/uri'; import { ILogService, NullLogService } from 'vs/platform/log/common/log'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; diff --git a/src/sql/workbench/parts/connection/browser/advancedPropertiesController.ts b/src/sql/workbench/contrib/connection/browser/advancedPropertiesController.ts similarity index 100% rename from src/sql/workbench/parts/connection/browser/advancedPropertiesController.ts rename to src/sql/workbench/contrib/connection/browser/advancedPropertiesController.ts diff --git a/src/sql/workbench/parts/connection/browser/connection.contribution.ts b/src/sql/workbench/contrib/connection/browser/connection.contribution.ts similarity index 95% rename from src/sql/workbench/parts/connection/browser/connection.contribution.ts rename to src/sql/workbench/contrib/connection/browser/connection.contribution.ts index dd9493e8c5..e019ad6100 100644 --- a/src/sql/workbench/parts/connection/browser/connection.contribution.ts +++ b/src/sql/workbench/contrib/connection/browser/connection.contribution.ts @@ -5,13 +5,13 @@ import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; -import { AddServerGroupAction, AddServerAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; -import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/parts/connection/browser/connectionActions'; +import { AddServerGroupAction, AddServerAction } from 'sql/workbench/contrib/objectExplorer/browser/connectionTreeAction'; +import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/contrib/connection/browser/connectionActions'; import * as azdata from 'azdata'; import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { localize } from 'vs/nls'; -import { ConnectionStatusbarItem } from 'sql/workbench/parts/connection/browser/connectionStatus'; +import { ConnectionStatusbarItem } from 'sql/workbench/contrib/connection/browser/connectionStatus'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/parts/connection/browser/connectionActions.ts b/src/sql/workbench/contrib/connection/browser/connectionActions.ts similarity index 96% rename from src/sql/workbench/parts/connection/browser/connectionActions.ts rename to src/sql/workbench/contrib/connection/browser/connectionActions.ts index 3eaa4181be..3609c6e65f 100644 --- a/src/sql/workbench/parts/connection/browser/connectionActions.ts +++ b/src/sql/workbench/contrib/connection/browser/connectionActions.ts @@ -12,9 +12,9 @@ import { INotificationService, INotificationActions } from 'vs/platform/notifica import Severity from 'vs/base/common/severity'; import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; -import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput'; -import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; +import { EditDataInput } from 'sql/workbench/contrib/editData/browser/editDataInput'; +import { DashboardInput } from 'sql/workbench/contrib/dashboard/browser/dashboardInput'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/connection/browser/connectionStatus.ts b/src/sql/workbench/contrib/connection/browser/connectionStatus.ts similarity index 100% rename from src/sql/workbench/parts/connection/browser/connectionStatus.ts rename to src/sql/workbench/contrib/connection/browser/connectionStatus.ts diff --git a/src/sql/workbench/parts/connection/browser/media/collapsed-dark.svg b/src/sql/workbench/contrib/connection/browser/media/collapsed-dark.svg similarity index 100% rename from src/sql/workbench/parts/connection/browser/media/collapsed-dark.svg rename to src/sql/workbench/contrib/connection/browser/media/collapsed-dark.svg diff --git a/src/sql/workbench/parts/connection/browser/media/connected_active_server.svg b/src/sql/workbench/contrib/connection/browser/media/connected_active_server.svg similarity index 100% rename from src/sql/workbench/parts/connection/browser/media/connected_active_server.svg rename to src/sql/workbench/contrib/connection/browser/media/connected_active_server.svg diff --git a/src/sql/workbench/parts/connection/browser/media/connected_active_server_inverse.svg b/src/sql/workbench/contrib/connection/browser/media/connected_active_server_inverse.svg similarity index 100% rename from src/sql/workbench/parts/connection/browser/media/connected_active_server_inverse.svg rename to src/sql/workbench/contrib/connection/browser/media/connected_active_server_inverse.svg diff --git a/src/sql/workbench/parts/connection/browser/media/connectionViewlet.css b/src/sql/workbench/contrib/connection/browser/media/connectionViewlet.css similarity index 100% rename from src/sql/workbench/parts/connection/browser/media/connectionViewlet.css rename to src/sql/workbench/contrib/connection/browser/media/connectionViewlet.css diff --git a/src/sql/workbench/parts/connection/browser/media/disconnected_server.svg b/src/sql/workbench/contrib/connection/browser/media/disconnected_server.svg similarity index 100% rename from src/sql/workbench/parts/connection/browser/media/disconnected_server.svg rename to src/sql/workbench/contrib/connection/browser/media/disconnected_server.svg diff --git a/src/sql/workbench/parts/connection/browser/media/disconnected_server_inverse.svg b/src/sql/workbench/contrib/connection/browser/media/disconnected_server_inverse.svg similarity index 100% rename from src/sql/workbench/parts/connection/browser/media/disconnected_server_inverse.svg rename to src/sql/workbench/contrib/connection/browser/media/disconnected_server_inverse.svg diff --git a/src/sql/workbench/parts/connection/browser/media/expanded-dark.svg b/src/sql/workbench/contrib/connection/browser/media/expanded-dark.svg similarity index 100% rename from src/sql/workbench/parts/connection/browser/media/expanded-dark.svg rename to src/sql/workbench/contrib/connection/browser/media/expanded-dark.svg diff --git a/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts b/src/sql/workbench/contrib/connection/browser/recentConnectionTreeController.ts similarity index 99% rename from src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts rename to src/sql/workbench/contrib/connection/browser/recentConnectionTreeController.ts index bfce15a121..b46d41bbf8 100644 --- a/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts +++ b/src/sql/workbench/contrib/connection/browser/recentConnectionTreeController.ts @@ -7,7 +7,7 @@ import { DefaultController, ICancelableEvent } from 'vs/base/parts/tree/browser/ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { ClearSingleRecentConnectionAction } from 'sql/workbench/parts/connection/browser/connectionActions'; +import { ClearSingleRecentConnectionAction } from 'sql/workbench/contrib/connection/browser/connectionActions'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/workbench/parts/connection/browser/savedConnectionTreeController.ts b/src/sql/workbench/contrib/connection/browser/savedConnectionTreeController.ts similarity index 100% rename from src/sql/workbench/parts/connection/browser/savedConnectionTreeController.ts rename to src/sql/workbench/contrib/connection/browser/savedConnectionTreeController.ts diff --git a/src/sql/workbench/parts/connection/common/connection.ts b/src/sql/workbench/contrib/connection/common/connection.ts similarity index 100% rename from src/sql/workbench/parts/connection/common/connection.ts rename to src/sql/workbench/contrib/connection/common/connection.ts diff --git a/src/sql/workbench/parts/connection/common/connectionContextKey.ts b/src/sql/workbench/contrib/connection/common/connectionContextKey.ts similarity index 100% rename from src/sql/workbench/parts/connection/common/connectionContextKey.ts rename to src/sql/workbench/contrib/connection/common/connectionContextKey.ts diff --git a/src/sql/workbench/parts/connection/common/connectionGlobalStatus.ts b/src/sql/workbench/contrib/connection/common/connectionGlobalStatus.ts similarity index 93% rename from src/sql/workbench/parts/connection/common/connectionGlobalStatus.ts rename to src/sql/workbench/contrib/connection/common/connectionGlobalStatus.ts index 3f846fd3b6..09190db06e 100644 --- a/src/sql/workbench/parts/connection/common/connectionGlobalStatus.ts +++ b/src/sql/workbench/contrib/connection/common/connectionGlobalStatus.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { ConnectionSummary } from 'azdata'; -import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants'; +import * as LocalizedConstants from 'sql/workbench/contrib/connection/common/localizedConstants'; import { INotificationService } from 'vs/platform/notification/common/notification'; // Status when making connections from the viewlet diff --git a/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts b/src/sql/workbench/contrib/connection/common/connectionProviderExtension.ts similarity index 100% rename from src/sql/workbench/parts/connection/common/connectionProviderExtension.ts rename to src/sql/workbench/contrib/connection/common/connectionProviderExtension.ts diff --git a/src/sql/workbench/parts/connection/common/localizedConstants.ts b/src/sql/workbench/contrib/connection/common/localizedConstants.ts similarity index 100% rename from src/sql/workbench/parts/connection/common/localizedConstants.ts rename to src/sql/workbench/contrib/connection/common/localizedConstants.ts diff --git a/src/sql/workbench/parts/connection/common/serverInfoContextKey.ts b/src/sql/workbench/contrib/connection/common/serverInfoContextKey.ts similarity index 100% rename from src/sql/workbench/parts/connection/common/serverInfoContextKey.ts rename to src/sql/workbench/contrib/connection/common/serverInfoContextKey.ts diff --git a/src/sql/workbench/parts/connection/test/browser/advancedPropertiesDialog.test.ts b/src/sql/workbench/contrib/connection/test/browser/advancedPropertiesDialog.test.ts similarity index 96% rename from src/sql/workbench/parts/connection/test/browser/advancedPropertiesDialog.test.ts rename to src/sql/workbench/contrib/connection/test/browser/advancedPropertiesDialog.test.ts index 156d1f562d..c5bada3901 100644 --- a/src/sql/workbench/parts/connection/test/browser/advancedPropertiesDialog.test.ts +++ b/src/sql/workbench/contrib/connection/test/browser/advancedPropertiesDialog.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; -import { AdvancedPropertiesController } from 'sql/workbench/parts/connection/browser/advancedPropertiesController'; +import { AdvancedPropertiesController } from 'sql/workbench/contrib/connection/browser/advancedPropertiesController'; import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardContainer.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardContainer.contribution.ts similarity index 88% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardContainer.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardContainer.contribution.ts index 30e674c949..a9a6c5e3ad 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardContainer.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardContainer.contribution.ts @@ -8,13 +8,13 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { localize } from 'vs/nls'; import { registerContainer, generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution'; -import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution'; -import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.contribution'; +import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution'; +import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; +import { WEBVIEW_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.contribution'; import { values } from 'vs/base/common/collections'; import { find } from 'vs/base/common/arrays'; -import { NavSectionConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { NavSectionConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; const containerTypes = [ WIDGETS_CONTAINER, diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.component.ts similarity index 85% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.component.ts index fa20e1c76e..7f732bce86 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.component.ts @@ -9,9 +9,9 @@ import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angu import { Event, Emitter } from 'vs/base/common/event'; -import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; -import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { ControlHostContent } from 'sql/workbench/parts/dashboard/browser/contents/controlHostContent.component'; +import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; +import { TabConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { ControlHostContent } from 'sql/workbench/contrib/dashboard/browser/contents/controlHostContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @Component({ diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.css diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardErrorContainer.component.ts similarity index 91% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardErrorContainer.component.ts index 056f175006..0e679ee754 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardErrorContainer.component.ts @@ -7,8 +7,8 @@ import 'vs/css!./dashboardErrorContainer'; import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ChangeDetectorRef, AfterViewInit } from '@angular/core'; -import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; +import { TabConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardErrorContainer.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardErrorContainer.css diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.html b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.html rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.component.ts similarity index 94% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.component.ts index cc86d45c3b..0bc5c64158 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.component.ts @@ -8,10 +8,10 @@ import 'vs/css!./dashboardGridContainer'; import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, ContentChild } from '@angular/core'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component'; -import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; -import { WebviewContent } from 'sql/workbench/parts/dashboard/browser/contents/webviewContent.component'; +import { TabConfig, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardWidgetWrapper } from 'sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component'; +import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; +import { WebviewContent } from 'sql/workbench/contrib/dashboard/browser/contents/webviewContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution.ts similarity index 96% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution.ts index 258d94f9e0..21fd258500 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution.ts @@ -7,7 +7,7 @@ import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/ext import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { generateDashboardGridLayoutSchema } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution'; +import { generateDashboardGridLayoutSchema } from 'sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution'; import { registerContainerType, registerNavSectionContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.css diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts similarity index 87% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts index 8c05062a63..17f3b6f00e 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts @@ -7,12 +7,12 @@ import 'vs/css!./dashboardHomeContainer'; import { Component, forwardRef, Input, ChangeDetectorRef, Inject, ViewChild, ContentChild } from '@angular/core'; -import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.component'; -import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { DashboardWidgetContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component'; +import { WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; -import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component'; +import { DashboardWidgetWrapper } from 'sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component'; import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.css diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.component.ts similarity index 89% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.component.ts index dbc56e2c99..537c660fc9 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.component.ts @@ -7,8 +7,8 @@ import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angu import { Event, Emitter } from 'vs/base/common/event'; -import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; -import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; +import { TabConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.css diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.html b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.html rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.ts index 08bd2f199a..230b38ea08 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component.ts @@ -8,13 +8,13 @@ import 'vs/css!./dashboardNavSection'; import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, OnChanges, AfterContentInit } from '@angular/core'; import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; -import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution'; -import * as dashboardHelper from 'sql/workbench/parts/dashboard/browser/core/dashboardHelper'; +import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; +import { WIDGETS_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; +import * as dashboardHelper from 'sql/workbench/contrib/dashboard/browser/core/dashboardHelper'; import { Event, Emitter } from 'vs/base/common/event'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution.ts similarity index 95% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution.ts index 75e80995b9..eca71d1422 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution.ts @@ -10,10 +10,10 @@ import { createCSSRule, asCSSUrl } from 'vs/base/browser/dom'; import { IdGenerator } from 'vs/base/common/idGenerator'; import * as resources from 'vs/base/common/resources'; -import { NavSectionConfig, IUserFriendlyIcon } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { NavSectionConfig, IUserFriendlyIcon } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { registerContainerType, generateNavSectionContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution'; +import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; import { values } from 'vs/base/common/collections'; export const NAV_SECTION = 'nav-section'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.css diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.component.ts similarity index 84% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.component.ts index c6077eb8d8..d57cc02d0c 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.component.ts @@ -9,9 +9,9 @@ import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angu import { Event, Emitter } from 'vs/base/common/event'; -import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; -import { TabConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { WebviewContent } from 'sql/workbench/parts/dashboard/browser/contents/webviewContent.component'; +import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; +import { TabConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { WebviewContent } from 'sql/workbench/contrib/dashboard/browser/contents/webviewContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @Component({ diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.css diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts similarity index 87% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.component.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts index 271e96d26e..b6c2e11d8b 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts @@ -7,9 +7,9 @@ import 'vs/css!./dashboardWidgetContainer'; import { Component, Inject, Input, forwardRef, ViewChild, OnDestroy, ChangeDetectorRef, AfterContentInit } from '@angular/core'; -import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardTab } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; -import { WidgetContent } from 'sql/workbench/parts/dashboard/browser/contents/widgetContent.component'; +import { TabConfig, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; +import { WidgetContent } from 'sql/workbench/contrib/dashboard/browser/contents/widgetContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution.ts index 600062c7d2..56709eb58f 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution.ts @@ -7,7 +7,7 @@ import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/ext import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { generateDashboardWidgetSchema } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution'; +import { generateDashboardWidgetSchema } from 'sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution'; import { registerContainerType, registerNavSectionContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.css b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.css rename to src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.css diff --git a/src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.html b/src/sql/workbench/contrib/dashboard/browser/contents/controlHostContent.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.html rename to src/sql/workbench/contrib/dashboard/browser/contents/controlHostContent.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.ts b/src/sql/workbench/contrib/dashboard/browser/contents/controlHostContent.component.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.ts rename to src/sql/workbench/contrib/dashboard/browser/contents/controlHostContent.component.ts diff --git a/src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.css b/src/sql/workbench/contrib/dashboard/browser/contents/controlHostContent.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.css rename to src/sql/workbench/contrib/dashboard/browser/contents/controlHostContent.css diff --git a/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.html b/src/sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.html rename to src/sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts b/src/sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component.ts similarity index 91% rename from src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts rename to src/sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component.ts index 1fedcd5a51..bcbe27c9f6 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component.ts @@ -11,18 +11,18 @@ import { ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, Type, ComponentRef } from '@angular/core'; -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; -import { WidgetConfig, WIDGET_CONFIG, IDashboardWidget } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; +import { WidgetConfig, WIDGET_CONFIG, IDashboardWidget } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry'; -import { RefreshWidgetAction, ToggleMoreWidgetAction, DeleteWidgetAction, CollapseWidgetAction } from 'sql/workbench/parts/dashboard/browser/core/actions'; +import { RefreshWidgetAction, ToggleMoreWidgetAction, DeleteWidgetAction, CollapseWidgetAction } from 'sql/workbench/contrib/dashboard/browser/core/actions'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; /* Widgets */ -import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component'; -import { ExplorerWidget } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component'; -import { TasksWidget } from 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component'; -import { InsightsWidget } from 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component'; -import { WebviewWidget } from 'sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component'; +import { PropertiesWidgetComponent } from 'sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component'; +import { ExplorerWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component'; +import { TasksWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component'; +import { InsightsWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component'; +import { WebviewWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.component'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; diff --git a/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.css b/src/sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.css rename to src/sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.css diff --git a/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts b/src/sql/workbench/contrib/dashboard/browser/contents/webviewContent.component.ts similarity index 96% rename from src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts rename to src/sql/workbench/contrib/dashboard/browser/contents/webviewContent.component.ts index 7c78472133..1a72c3a715 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/contents/webviewContent.component.ts @@ -11,7 +11,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; import { memoize } from 'vs/base/common/decorators'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewService'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; diff --git a/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.css b/src/sql/workbench/contrib/dashboard/browser/contents/webviewContent.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/webviewContent.css rename to src/sql/workbench/contrib/dashboard/browser/contents/webviewContent.css diff --git a/src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.html b/src/sql/workbench/contrib/dashboard/browser/contents/widgetContent.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.html rename to src/sql/workbench/contrib/dashboard/browser/contents/widgetContent.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.ts b/src/sql/workbench/contrib/dashboard/browser/contents/widgetContent.component.ts similarity index 96% rename from src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.ts rename to src/sql/workbench/contrib/dashboard/browser/contents/widgetContent.component.ts index d9f4c83134..c3e8ea83b5 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/contents/widgetContent.component.ts @@ -8,10 +8,10 @@ import 'vs/css!./widgetContent'; import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryList, ChangeDetectorRef, ElementRef, AfterViewInit } from '@angular/core'; import { NgGridConfig, NgGrid, NgGridItem } from 'angular2-grid'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component'; +import { WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardWidgetWrapper } from 'sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component'; import { subscriptionToDisposable, AngularDisposable } from 'sql/base/browser/lifecycle'; import { IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/workbench/parts/dashboard/browser/contents/widgetContent.css b/src/sql/workbench/contrib/dashboard/browser/contents/widgetContent.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/contents/widgetContent.css rename to src/sql/workbench/contrib/dashboard/browser/contents/widgetContent.css diff --git a/src/sql/workbench/parts/dashboard/browser/core/actions.ts b/src/sql/workbench/contrib/dashboard/browser/core/actions.ts similarity index 98% rename from src/sql/workbench/parts/dashboard/browser/core/actions.ts rename to src/sql/workbench/contrib/dashboard/browser/core/actions.ts index 870bcb4e71..4df21f05a0 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/actions.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/actions.ts @@ -10,7 +10,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/browser/angularEventingService'; import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; -import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { subscriptionToDisposable } from 'sql/base/browser/lifecycle'; import { find, firstIndex } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/dashboard/browser/core/componentHost.directive.ts b/src/sql/workbench/contrib/dashboard/browser/core/componentHost.directive.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/core/componentHost.directive.ts rename to src/sql/workbench/contrib/dashboard/browser/core/componentHost.directive.ts diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardHelper.ts similarity index 88% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardHelper.ts index 41def62e9e..8923aae0db 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardHelper.ts @@ -9,16 +9,16 @@ import { Registry } from 'vs/platform/registry/common/platform'; import * as nls from 'vs/nls'; import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; -import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution'; -import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.contribution'; -import { MODELVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.contribution'; -import { CONTROLHOST_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.contribution'; -import { NAV_SECTION } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; +import { WIDGETS_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; +import { WEBVIEW_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.contribution'; +import { MODELVIEW_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.contribution'; +import { CONTROLHOST_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.contribution'; +import { NAV_SECTION } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution'; import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; import { SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import * as Constants from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.html b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.html rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts similarity index 94% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts index 8bcaa00d98..9f795ccd5d 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts @@ -4,23 +4,23 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./dashboardPage'; -import 'sql/workbench/parts/dashboard/browser/core/dashboardPanelStyles'; +import 'sql/workbench/contrib/dashboard/browser/core/dashboardPanelStyles'; import { Component, Inject, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, ChangeDetectorRef } from '@angular/core'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { IPropertiesConfig } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution'; +import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { IPropertiesConfig } from 'sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution'; import { PanelComponent } from 'sql/base/browser/ui/panel/panel.component'; -import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { PinUnpinTabAction, AddFeatureTabAction } from './actions'; import { TabComponent, TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; -import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/browser/core/interfaces'; -import * as dashboardHelper from 'sql/workbench/parts/dashboard/browser/core/dashboardHelper'; -import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution'; +import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; +import * as dashboardHelper from 'sql/workbench/contrib/dashboard/browser/core/dashboardHelper'; +import { WIDGETS_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import * as Constants from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.css b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardPage.css rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.css diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardPanel.css b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPanel.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardPanel.css rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardPanel.css diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardPanelStyles.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPanelStyles.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardPanelStyles.ts rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardPanelStyles.ts diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts index b97cb06940..ac8464a170 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution.ts @@ -9,11 +9,11 @@ import { localize } from 'vs/nls'; import * as types from 'vs/base/common/types'; import * as Constants from 'sql/platform/connection/common/constants'; -import { registerTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { registerTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution'; -import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution'; +import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution'; +import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; import { values } from 'vs/base/common/collections'; export interface IDashboardTabContrib { diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardWidget.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardWidget.ts similarity index 95% rename from src/sql/workbench/parts/dashboard/browser/core/dashboardWidget.ts rename to src/sql/workbench/contrib/dashboard/browser/core/dashboardWidget.ts index d7aaae4e6c..8abbd1c858 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardWidget.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardWidget.ts @@ -7,7 +7,7 @@ import { InjectionToken, OnDestroy } from '@angular/core'; import { NgGridItemConfig } from 'angular2-grid'; import { Action } from 'vs/base/common/actions'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; export interface IDashboardWidget { actions: Array; diff --git a/src/sql/workbench/parts/dashboard/browser/core/interfaces.ts b/src/sql/workbench/contrib/dashboard/browser/core/interfaces.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/core/interfaces.ts rename to src/sql/workbench/contrib/dashboard/browser/core/interfaces.ts diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.component.html b/src/sql/workbench/contrib/dashboard/browser/dashboard.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/dashboard.component.html rename to src/sql/workbench/contrib/dashboard/browser/dashboard.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.component.ts b/src/sql/workbench/contrib/dashboard/browser/dashboard.component.ts similarity index 95% rename from src/sql/workbench/parts/dashboard/browser/dashboard.component.ts rename to src/sql/workbench/contrib/dashboard/browser/dashboard.component.ts index ef546b6ef8..186a48f8c7 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboard.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboard.component.ts @@ -11,8 +11,8 @@ import { Router } from '@angular/router'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as Utils from 'sql/platform/connection/common/utils'; -import { RefreshWidgetAction, EditDashboardAction } from 'sql/workbench/parts/dashboard/browser/core/actions'; -import { DashboardPage } from 'sql/workbench/parts/dashboard/browser/core/dashboardPage.component'; +import { RefreshWidgetAction, EditDashboardAction } from 'sql/workbench/contrib/dashboard/browser/core/actions'; +import { DashboardPage } from 'sql/workbench/contrib/dashboard/browser/core/dashboardPage.component'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/dashboard.contribution.ts similarity index 80% rename from src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/dashboard.contribution.ts index 278a7f7e24..645d9eb205 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboard.contribution.ts @@ -3,22 +3,22 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DashboardEditor } from 'sql/workbench/parts/dashboard/browser/dashboardEditor'; -import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput'; +import { DashboardEditor } from 'sql/workbench/contrib/dashboard/browser/dashboardEditor'; +import { DashboardInput } from 'sql/workbench/contrib/dashboard/browser/dashboardInput'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { Registry } from 'vs/platform/registry/common/platform'; import { localize } from 'vs/nls'; import { IConfigurationNode, IConfigurationRegistry, Extensions } from 'vs/platform/configuration/common/configurationRegistry'; -import { DASHBOARD_CONFIG_ID } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution'; -import { DATABASE_DASHBOARD_PROPERTIES, databaseDashboardPropertiesSchema, DATABASE_DASHBOARD_SETTING, databaseDashboardSettingSchema, DATABASE_DASHBOARD_TABS, databaseDashboardTabsSchema } from 'sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.contribution'; -import { SERVER_DASHBOARD_PROPERTIES, serverDashboardPropertiesSchema, SERVER_DASHBOARD_SETTING, serverDashboardSettingSchema, SERVER_DASHBOARD_TABS, serverDashboardTabsSchema } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution'; +import { DASHBOARD_CONFIG_ID } from 'sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution'; +import { DATABASE_DASHBOARD_PROPERTIES, databaseDashboardPropertiesSchema, DATABASE_DASHBOARD_SETTING, databaseDashboardSettingSchema, DATABASE_DASHBOARD_TABS, databaseDashboardTabsSchema } from 'sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.contribution'; +import { SERVER_DASHBOARD_PROPERTIES, serverDashboardPropertiesSchema, SERVER_DASHBOARD_SETTING, serverDashboardSettingSchema, SERVER_DASHBOARD_TABS, serverDashboardTabsSchema } from 'sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; -import { DE_MANAGE_COMMAND_ID, OE_MANAGE_COMMAND_ID } from 'sql/workbench/parts/dashboard/browser/dashboardActions'; +import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; +import { DE_MANAGE_COMMAND_ID, OE_MANAGE_COMMAND_ID } from 'sql/workbench/contrib/dashboard/browser/dashboardActions'; const configurationRegistry = Registry.as(Extensions.Configuration); const dashboardConfig: IConfigurationNode = { diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.css b/src/sql/workbench/contrib/dashboard/browser/dashboard.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/dashboard.css rename to src/sql/workbench/contrib/dashboard/browser/dashboard.css diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.module.ts b/src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts similarity index 62% rename from src/sql/workbench/parts/dashboard/browser/dashboard.module.ts rename to src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts index 3b79fbaad6..a8899116a6 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboard.module.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboard.module.ts @@ -23,39 +23,39 @@ import { Registry } from 'vs/platform/registry/common/platform'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; /* Services */ -import { BreadcrumbService } from 'sql/workbench/parts/dashboard/browser/services/breadcrumb.service'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { BreadcrumbService } from 'sql/workbench/contrib/dashboard/browser/services/breadcrumb.service'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; /* Directives */ -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; /* Base Components */ -import { DashboardComponent } from 'sql/workbench/parts/dashboard/browser/dashboard.component'; -import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component'; -import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.component'; -import { DashboardGridContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component'; -import { DashboardWebviewContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.component'; -import { DashboardModelViewContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.component'; -import { DashboardErrorContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardErrorContainer.component'; -import { DashboardNavSection } from 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component'; -import { WidgetContent } from 'sql/workbench/parts/dashboard/browser/contents/widgetContent.component'; +import { DashboardComponent } from 'sql/workbench/contrib/dashboard/browser/dashboard.component'; +import { DashboardWidgetWrapper } from 'sql/workbench/contrib/dashboard/browser/contents/dashboardWidgetWrapper.component'; +import { DashboardWidgetContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component'; +import { DashboardGridContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.component'; +import { DashboardWebviewContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.component'; +import { DashboardModelViewContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.component'; +import { DashboardErrorContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardErrorContainer.component'; +import { DashboardNavSection } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.component'; +import { WidgetContent } from 'sql/workbench/contrib/dashboard/browser/contents/widgetContent.component'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/modelComponentWrapper.component'; -import { WebviewContent } from 'sql/workbench/parts/dashboard/browser/contents/webviewContent.component'; +import { WebviewContent } from 'sql/workbench/contrib/dashboard/browser/contents/webviewContent.component'; import { BreadcrumbComponent } from 'sql/base/browser/ui/breadcrumb/breadcrumb.component'; import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; -import { DashboardHomeContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component'; -import { ControlHostContent } from 'sql/workbench/parts/dashboard/browser/contents/controlHostContent.component'; -import { DashboardControlHostContainer } from 'sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.component'; -import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/browser/jobsView.component'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; -import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/browser/alertsView.component'; -import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/browser/jobHistory.component'; -import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/browser/operatorsView.component'; -import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/browser/proxiesView.component'; -import { NotebooksViewComponent } from 'sql/workbench/parts/jobManagement/browser/notebooksView.component'; -import { NotebookHistoryComponent } from 'sql/workbench/parts/jobManagement/browser/notebookHistory.component'; +import { DashboardHomeContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component'; +import { ControlHostContent } from 'sql/workbench/contrib/dashboard/browser/contents/controlHostContent.component'; +import { DashboardControlHostContainer } from 'sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.component'; +import { JobsViewComponent } from 'sql/workbench/contrib/jobManagement/browser/jobsView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; +import { AlertsViewComponent } from 'sql/workbench/contrib/jobManagement/browser/alertsView.component'; +import { JobHistoryComponent } from 'sql/workbench/contrib/jobManagement/browser/jobHistory.component'; +import { OperatorsViewComponent } from 'sql/workbench/contrib/jobManagement/browser/operatorsView.component'; +import { ProxiesViewComponent } from 'sql/workbench/contrib/jobManagement/browser/proxiesView.component'; +import { NotebooksViewComponent } from 'sql/workbench/contrib/jobManagement/browser/notebooksView.component'; +import { NotebookHistoryComponent } from 'sql/workbench/contrib/jobManagement/browser/notebookHistory.component'; import LoadingSpinner from 'sql/workbench/browser/modelComponents/loadingSpinner.component'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; @@ -74,18 +74,18 @@ import { PanelModule } from 'sql/base/browser/ui/panel/panel.module'; import { ScrollableModule } from 'sql/base/browser/ui/scrollable/scrollable.module'; /* Pages */ -import { ServerDashboardPage } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component'; -import { DatabaseDashboardPage } from 'sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component'; +import { ServerDashboardPage } from 'sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component'; +import { DatabaseDashboardPage } from 'sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component'; const pageComponents = [ServerDashboardPage, DatabaseDashboardPage]; /* Widget Components */ -import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component'; -import { ExplorerWidget } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component'; -import { TasksWidget } from 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component'; -import { InsightsWidget } from 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component'; -import { WebviewWidget } from 'sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component'; -import { JobStepsViewComponent } from 'sql/workbench/parts/jobManagement/browser/jobStepsView.component'; +import { PropertiesWidgetComponent } from 'sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component'; +import { ExplorerWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component'; +import { TasksWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component'; +import { InsightsWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component'; +import { WebviewWidget } from 'sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.component'; +import { JobStepsViewComponent } from 'sql/workbench/contrib/jobManagement/browser/jobStepsView.component'; import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboardActions.ts b/src/sql/workbench/contrib/dashboard/browser/dashboardActions.ts similarity index 92% rename from src/sql/workbench/parts/dashboard/browser/dashboardActions.ts rename to src/sql/workbench/contrib/dashboard/browser/dashboardActions.ts index afdc5e0bc5..e604d72a6d 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboardActions.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboardActions.ts @@ -11,15 +11,15 @@ import { generateUri } from 'sql/platform/connection/common/utils'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { localize } from 'vs/nls'; import { Action } from 'vs/base/common/actions'; -import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; -import { ObjectExplorerActionsContext, getTreeNode } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { TreeSelectionHandler } from 'sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler'; +import { ObjectExplorerActionsContext, getTreeNode } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IViewsService } from 'vs/workbench/common/views'; -import { ConnectionViewletPanel } from 'sql/workbench/parts/dataExplorer/browser/connectionViewletPanel'; +import { ConnectionViewletPanel } from 'sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel'; export const DE_MANAGE_COMMAND_ID = 'dataExplorer.manage'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts b/src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts similarity index 96% rename from src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts rename to src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts index bdf5493c7c..ab60fe8797 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts @@ -15,8 +15,8 @@ import { DashboardInput } from './dashboardInput'; import { DashboardModule } from './dashboard.module'; import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { IDashboardComponentParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; -import { DASHBOARD_SELECTOR } from 'sql/workbench/parts/dashboard/browser/dashboard.component'; -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; +import { DASHBOARD_SELECTOR } from 'sql/workbench/contrib/dashboard/browser/dashboard.component'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboardInput.ts b/src/sql/workbench/contrib/dashboard/browser/dashboardInput.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/dashboardInput.ts rename to src/sql/workbench/contrib/dashboard/browser/dashboardInput.ts diff --git a/src/sql/workbench/parts/dashboard/browser/dashboardRegistry.ts b/src/sql/workbench/contrib/dashboard/browser/dashboardRegistry.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/dashboardRegistry.ts rename to src/sql/workbench/contrib/dashboard/browser/dashboardRegistry.ts index 46e5a724ad..c3e4842d56 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboardRegistry.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboardRegistry.ts @@ -9,10 +9,10 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; -import { ProviderProperties } from 'sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component'; -import { DATABASE_DASHBOARD_TABS } from 'sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.contribution'; -import { SERVER_DASHBOARD_TABS } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution'; -import { DASHBOARD_CONFIG_ID, DASHBOARD_TABS_KEY_PROPERTY } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution'; +import { ProviderProperties } from 'sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component'; +import { DATABASE_DASHBOARD_TABS } from 'sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.contribution'; +import { SERVER_DASHBOARD_TABS } from 'sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution'; +import { DASHBOARD_CONFIG_ID, DASHBOARD_TABS_KEY_PROPERTY } from 'sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution'; import { find } from 'vs/base/common/arrays'; export const Extensions = { diff --git a/src/sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution.ts b/src/sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution.ts rename to src/sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts b/src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts similarity index 86% rename from src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts rename to src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts index db76120df3..d9ec062068 100644 --- a/src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts @@ -5,11 +5,11 @@ import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angular/core'; -import { DashboardPage } from 'sql/workbench/parts/dashboard/browser/core/dashboardPage.component'; -import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/browser/services/breadcrumb.service'; +import { DashboardPage } from 'sql/workbench/contrib/dashboard/browser/core/dashboardPage.component'; +import { BreadcrumbClass } from 'sql/workbench/contrib/dashboard/browser/services/breadcrumb.service'; import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; -import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; +import { WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; diff --git a/src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts b/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts similarity index 88% rename from src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts rename to src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts index 9d568a519e..7d61e1d71f 100644 --- a/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts @@ -5,11 +5,11 @@ import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angular/core'; -import { DashboardPage } from 'sql/workbench/parts/dashboard/browser/core/dashboardPage.component'; -import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/browser/services/breadcrumb.service'; +import { DashboardPage } from 'sql/workbench/contrib/dashboard/browser/core/dashboardPage.component'; +import { BreadcrumbClass } from 'sql/workbench/contrib/dashboard/browser/services/breadcrumb.service'; import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; -import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; diff --git a/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution.ts similarity index 97% rename from src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution.ts index 860be65711..aa09c5222d 100644 --- a/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.contribution.ts @@ -5,7 +5,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { generateDashboardWidgetSchema, generateDashboardTabSchema } from 'sql/workbench/parts/dashboard/browser/pages/dashboardPageContribution'; +import { generateDashboardWidgetSchema, generateDashboardTabSchema } from 'sql/workbench/contrib/dashboard/browser/pages/dashboardPageContribution'; export interface IPropertiesConfig { edition: number | Array; diff --git a/src/sql/workbench/parts/dashboard/browser/services/breadcrumb.service.ts b/src/sql/workbench/contrib/dashboard/browser/services/breadcrumb.service.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/services/breadcrumb.service.ts rename to src/sql/workbench/contrib/dashboard/browser/services/breadcrumb.service.ts diff --git a/src/sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service.ts b/src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts similarity index 97% rename from src/sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service.ts rename to src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts index e15355f0c3..4da83e35cf 100644 --- a/src/sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service.ts +++ b/src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts @@ -14,8 +14,8 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; -import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; -import { TabSettingConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; +import { TabSettingConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; /* VS imports */ diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTree.ts similarity index 97% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTree.ts index 8da947d7be..5f35e6b088 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTree.ts @@ -22,8 +22,8 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IEditorProgressService } from 'vs/platform/progress/common/progress'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem'; -import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; -import { ObjectMetadataWrapper } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/objectMetadataWrapper'; +import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext'; +import { ObjectMetadataWrapper } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/objectMetadataWrapper'; export declare type TreeResource = IConnectionProfile | ObjectMetadataWrapper; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeActions.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeActions.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext.ts similarity index 96% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext.ts index af0394290a..dacfe83bf5 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext.ts @@ -7,7 +7,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { MetadataType } from 'sql/platform/connection/common/connectionManagement'; -import { ObjectMetadataWrapper } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/objectMetadataWrapper'; +import { ObjectMetadataWrapper } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/objectMetadataWrapper'; export declare type ContextResource = IConnectionProfile | ObjectMetadataWrapper; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.html b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.html rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component.ts similarity index 96% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component.ts index 49411c895b..f6ed9559c9 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.component.ts @@ -10,7 +10,7 @@ import 'vs/css!./media/explorerWidget'; import { Component, Inject, forwardRef, OnInit, ViewChild, ElementRef } from '@angular/core'; import { Router } from '@angular/router'; -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ExplorerFilter, ExplorerRenderer, ExplorerDataSource, ExplorerController, ExplorerModel } from './explorerTree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; @@ -27,7 +27,7 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { subscriptionToDisposable } from 'sql/base/browser/lifecycle'; -import { ObjectMetadataWrapper } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/objectMetadataWrapper'; +import { ObjectMetadataWrapper } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/objectMetadataWrapper'; @Component({ selector: 'explorer-widget', diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.contribution.ts similarity index 85% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.contribution.ts index 0a5e43f7eb..b568efae09 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.contribution.ts @@ -6,10 +6,10 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerDashboardWidget } from 'sql/platform/dashboard/browser/widgetRegistry'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { ExplorerManageAction } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions'; +import { ExplorerManageAction } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeActions'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; +import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext'; const explorerSchema: IJSONSchema = { type: 'object', diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/media/explorerWidget.css b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/media/explorerWidget.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/media/explorerWidget.css rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/media/explorerWidget.css diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/objectMetadataWrapper.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/explorer/objectMetadataWrapper.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/explorer/objectMetadataWrapper.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/explorer/objectMetadataWrapper.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/actions.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/actions.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/actions.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/actions.ts index 1dade9c533..0d8ce3b776 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/actions.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/actions.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import { RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { InsightActionContext } from 'sql/workbench/browser/actions'; -import { openNewQuery } from 'sql/workbench/parts/query/browser/queryActions'; +import { openNewQuery } from 'sql/workbench/contrib/query/browser/queryActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; export class RunInsightQueryAction extends Action { diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts similarity index 98% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts index 656afcf3fa..bb50d8706a 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.component.ts @@ -9,9 +9,9 @@ import { } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; import { InsightAction, InsightActionContext } from 'sql/workbench/browser/actions'; import { Extensions, IInsightRegistry, IInsightsConfig, IInsightsView, getWidgetAutoRefreshState } from 'sql/platform/dashboard/browser/insightRegistry'; import { resolveQueryFilePath } from 'sql/workbench/services/insights/common/insightsUtils'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts similarity index 97% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts index e9c77d62e8..7aca59d43d 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution.ts @@ -8,7 +8,7 @@ import { join } from 'vs/base/common/path'; import { registerDashboardWidget, registerNonCustomDashboardWidget } from 'sql/platform/dashboard/browser/widgetRegistry'; import { Extensions as InsightExtensions, IInsightRegistry, setWidgetAutoRefreshState } from 'sql/platform/dashboard/browser/insightRegistry'; import { IInsightTypeContrib } from './interfaces'; -import { insightsContribution, insightsSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidgetSchemas'; +import { insightsContribution, insightsSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidgetSchemas'; import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidgetSchemas.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidgetSchemas.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidgetSchemas.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidgetSchemas.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/interfaces.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/interfaces.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/interfaces.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/interfaces.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts similarity index 97% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts index 7cc8789b0d..da7116c981 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts @@ -9,16 +9,16 @@ import * as chartjs from 'chart.js'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { mixin } from 'sql/base/common/objects'; -import { defaultChartConfig, IChartConfig, IDataSet } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces'; +import { defaultChartConfig, IChartConfig, IDataSet } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as types from 'vs/base/common/types'; import { Disposable } from 'vs/base/common/lifecycle'; import * as nls from 'vs/nls'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; -import { IInsightData, IPointDataSet } from 'sql/workbench/parts/charts/browser/interfaces'; +import { IInsightData, IPointDataSet } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; -import { ChartType, LegendPosition } from 'sql/workbench/parts/charts/common/interfaces'; +import { ChartType, LegendPosition } from 'sql/workbench/contrib/charts/common/interfaces'; import { createMemoizer } from 'vs/base/common/decorators'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts similarity index 89% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts index 1f820a6855..ae9f20bb51 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { LegendPosition, DataDirection } from 'sql/workbench/parts/charts/common/interfaces'; +import { LegendPosition, DataDirection } from 'sql/workbench/contrib/charts/common/interfaces'; export interface IDataSet { data: Array; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts similarity index 90% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts index 8a41282e92..13c873c464 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.component.ts @@ -3,17 +3,17 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ChartInsight } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.component'; +import { ChartInsight } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component'; import { mixin } from 'sql/base/common/objects'; -import { IChartConfig } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces'; +import { IChartConfig } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import { editorLineNumbers } from 'vs/editor/common/view/editorColorRegistry'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; -import { customMixin } from 'sql/workbench/parts/charts/browser/interfaces'; -import { ChartType } from 'sql/workbench/parts/charts/common/interfaces'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { customMixin } from 'sql/workbench/contrib/charts/browser/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; export interface IBarChartConfig extends IChartConfig { yAxisMin: number; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution.ts similarity index 91% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution.ts index d3243a64a0..1200a23a85 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution.ts @@ -8,7 +8,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry'; -import { chartInsightSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution'; +import { chartInsightSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution'; import BarChart from './barChart.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts index cc5581e1e1..e36ddf2b6c 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.component.ts @@ -6,7 +6,7 @@ import PieChart from './pieChart.component'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ChartType } from 'sql/workbench/parts/charts/common/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; export default class DoughnutChart extends PieChart { diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution.ts similarity index 85% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution.ts index c50995fe30..c784c768f3 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution.ts @@ -6,7 +6,7 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry'; -import { chartInsightSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution'; +import { chartInsightSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution'; import DoughnutChart from './doughnutChart.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts index 3a7dc5adad..643ffaf831 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.component.ts @@ -6,8 +6,8 @@ import BarChart from './barChart.component'; import { forwardRef, Inject, ChangeDetectorRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ChartType } from 'sql/workbench/parts/charts/common/interfaces'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; export default class HorizontalBarChart extends BarChart { protected readonly chartType: ChartType = ChartType.HorizontalBar; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts similarity index 86% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts index f9cfbd8d17..0126839dc0 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts @@ -7,7 +7,7 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry'; -import { barChartSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; import HorizontalBarChart from './horizontalBarChart.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts similarity index 90% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts index 3a65c8ec42..802474beb3 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.component.ts @@ -6,11 +6,11 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import BarChart, { IBarChartConfig } from './barChart.component'; -import { defaultChartConfig, IDataSet } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces'; +import { defaultChartConfig, IDataSet } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { IPointDataSet } from 'sql/workbench/parts/charts/browser/interfaces'; -import { DataType, ChartType } from 'sql/workbench/parts/charts/common/interfaces'; +import { IPointDataSet } from 'sql/workbench/contrib/charts/browser/interfaces'; +import { DataType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; import { values } from 'vs/base/common/collections'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution.ts similarity index 90% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution.ts index f655c15640..b5c2d60d65 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution.ts @@ -8,7 +8,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry'; -import { barChartSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; import LineChart from './lineChart.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts similarity index 82% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts index d173733a63..29b657b9ad 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.component.ts @@ -3,11 +3,11 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ChartInsight } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.component'; +import { ChartInsight } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ChartType } from 'sql/workbench/parts/charts/common/interfaces'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; export default class PieChart extends ChartInsight { protected readonly chartType: ChartType = ChartType.Pie; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution.ts similarity index 85% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution.ts index 0aed98a99d..9797185916 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution.ts @@ -6,7 +6,7 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry'; -import { chartInsightSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution'; +import { chartInsightSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.contribution'; import PieChart from './pieChart.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts similarity index 86% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts index 264f416115..99357e1ec3 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.component.ts @@ -4,13 +4,13 @@ *--------------------------------------------------------------------------------------------*/ import LineChart, { ILineConfig } from './lineChart.component'; -import { defaultChartConfig } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces'; +import { defaultChartConfig } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces'; import { mixin, deepClone } from 'vs/base/common/objects'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { ChartType } from 'sql/workbench/parts/charts/common/interfaces'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; const defaultScatterConfig = mixin(deepClone(defaultChartConfig), { dataType: 'point', dataDirection: 'horizontal' }) as ILineConfig; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution.ts similarity index 85% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution.ts index d7afad253f..9100661a44 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution.ts @@ -7,7 +7,7 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry'; -import { barChartSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; import ScatterChart from './scatterChart.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts similarity index 90% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts index 2c7c586d09..e00d3f8724 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.component.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import LineChart, { ILineConfig } from './lineChart.component'; -import { defaultChartConfig } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/interfaces'; +import { defaultChartConfig } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/interfaces'; import { mixin, deepClone, assign } from 'vs/base/common/objects'; import { Color } from 'vs/base/common/color'; import { ChangeDetectorRef, Inject, forwardRef } from '@angular/core'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { IPointDataSet } from 'sql/workbench/parts/charts/browser/interfaces'; -import { ChartType } from 'sql/workbench/parts/charts/common/interfaces'; +import { IPointDataSet } from 'sql/workbench/contrib/charts/browser/interfaces'; +import { ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; import { values } from 'vs/base/common/collections'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts similarity index 85% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts index 2042eb5661..0d6a74b9a0 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts @@ -7,7 +7,7 @@ import { mixin, deepClone } from 'vs/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/browser/insightRegistry'; -import { barChartSchema } from 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; import TimeSeriesChart from './timeSeriesChart.component'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/countInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts similarity index 93% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/countInsight.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts index 809713809c..dd89b997d3 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/countInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts @@ -5,7 +5,7 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef } from '@angular/core'; -import { IInsightData } from 'sql/workbench/parts/charts/browser/interfaces'; +import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; @Component({ diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/countInsight.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/countInsight.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/imageInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts similarity index 97% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/imageInsight.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts index 3bdbfc33b8..a2839da5ef 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/imageInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts @@ -6,7 +6,7 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, OnInit, ElementRef } from '@angular/core'; import { mixin } from 'vs/base/common/objects'; -import { IInsightData } from 'sql/workbench/parts/charts/browser/interfaces'; +import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; import { startsWith } from 'vs/base/common/strings'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/imageInsight.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/imageInsight.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/tableInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts similarity index 97% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/tableInsight.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts index 64a6751b51..93fa377646 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/tableInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts @@ -13,7 +13,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; -import { IInsightData } from 'sql/workbench/parts/charts/browser/interfaces'; +import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; @Component({ diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/views/tableInsight.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/insights/views/tableInsight.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesJson.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesJson.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesJson.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesJson.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.html b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.html rename to src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts similarity index 98% rename from src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts index 4391040bd7..bade6e2984 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component.ts @@ -5,10 +5,10 @@ import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ElementRef, ViewChild } from '@angular/core'; -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; -import { IDashboardRegistry, Extensions as DashboardExtensions } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardRegistry, Extensions as DashboardExtensions } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { DatabaseInfo, ServerInfo } from 'azdata'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/tasks/media/taskWidget.css b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/media/taskWidget.css similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/tasks/media/taskWidget.css rename to src/sql/workbench/contrib/dashboard/browser/widgets/tasks/media/taskWidget.css diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.html b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.html similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.html rename to src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.html diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts similarity index 98% rename from src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts index 9194246bcc..170de5047a 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts @@ -10,7 +10,7 @@ import 'vs/css!./media/taskWidget'; import { Component, Inject, forwardRef, ViewChild, OnInit, ElementRef } from '@angular/core'; /* SQL imports */ -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.component.ts similarity index 94% rename from src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.component.ts index c41cbabb39..ed36bcfa52 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.component.ts @@ -9,8 +9,8 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; import { memoize } from 'vs/base/common/decorators'; -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewService'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.contribution.ts similarity index 100% rename from src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.contribution.ts rename to src/sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.contribution.ts diff --git a/src/sql/workbench/parts/dashboard/test/electron-browser/explorerWidget.component.test.ts b/src/sql/workbench/contrib/dashboard/test/electron-browser/explorerWidget.component.test.ts similarity index 94% rename from src/sql/workbench/parts/dashboard/test/electron-browser/explorerWidget.component.test.ts rename to src/sql/workbench/contrib/dashboard/test/electron-browser/explorerWidget.component.test.ts index 6a7d027d9b..a5778c7133 100644 --- a/src/sql/workbench/parts/dashboard/test/electron-browser/explorerWidget.component.test.ts +++ b/src/sql/workbench/contrib/dashboard/test/electron-browser/explorerWidget.component.test.ts @@ -6,7 +6,7 @@ import { MetadataType } from 'sql/platform/connection/common/connectionManagement'; import * as assert from 'assert'; -import { ObjectMetadataWrapper } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/objectMetadataWrapper'; +import { ObjectMetadataWrapper } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/objectMetadataWrapper'; suite('Explorer Widget Tests', () => { test('Sorting dashboard search objects works correctly', () => { diff --git a/src/sql/workbench/parts/dashboard/test/electron-browser/propertiesWidget.component.test.ts b/src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts similarity index 91% rename from src/sql/workbench/parts/dashboard/test/electron-browser/propertiesWidget.component.test.ts rename to src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts index 25552c59c2..711246bcd8 100644 --- a/src/sql/workbench/parts/dashboard/test/electron-browser/propertiesWidget.component.test.ts +++ b/src/sql/workbench/contrib/dashboard/test/electron-browser/propertiesWidget.component.test.ts @@ -7,10 +7,10 @@ import { Observable } from 'rxjs/Observable'; // of is not on Observable by default, need to import it import 'rxjs/add/observable/of'; -import { WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; +import { WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service'; import { SingleAdminService, SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component'; +import { PropertiesWidgetComponent } from 'sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesWidget.component'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as TypeMoq from 'typemoq'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts b/src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts similarity index 96% rename from src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts rename to src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts index 016956783f..7a601de1b3 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel.ts @@ -12,11 +12,11 @@ import { IViewletViewOptions } from 'vs/workbench/browser/parts/views/viewsViewl import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ViewletPanel, IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelViewlet'; import { IAction } from 'vs/base/common/actions'; -import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeView'; import { ActiveConnectionsFilterAction, AddServerAction, AddServerGroupAction -} from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; +} from 'sql/workbench/contrib/objectExplorer/browser/connectionTreeAction'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ITree } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution.ts b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts similarity index 96% rename from src/sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution.ts rename to src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts index 41d84dca71..7f548f13a1 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution.ts @@ -8,14 +8,14 @@ import 'vs/css!./media/dataExplorer.contribution'; import { localize } from 'vs/nls'; import { ViewletRegistry, Extensions as ViewletExtensions, ViewletDescriptor } from 'vs/workbench/browser/viewlet'; import { Registry } from 'vs/platform/registry/common/platform'; -import { DataExplorerViewlet, DataExplorerViewletViewsContribution, OpenDataExplorerViewletAction, VIEWLET_ID } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet'; +import { DataExplorerViewlet, DataExplorerViewletViewsContribution, OpenDataExplorerViewletAction, VIEWLET_ID } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; -import { DataExplorerContainerExtensionHandler } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint'; +import { DataExplorerContainerExtensionHandler } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerExtensionPoint'; // Data Explorer Viewlet const viewletDescriptor = new ViewletDescriptor( diff --git a/src/sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint.ts b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerExtensionPoint.ts similarity index 98% rename from src/sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint.ts rename to src/sql/workbench/contrib/dataExplorer/browser/dataExplorerExtensionPoint.ts index 5d551b8725..fd68f723c3 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerExtensionPoint.ts @@ -15,7 +15,7 @@ import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { coalesce } from 'vs/base/common/arrays'; import { CustomTreeViewPanel, CustomTreeView } from 'sql/workbench/browser/parts/views/customView'; -import { VIEWLET_ID } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet'; +import { VIEWLET_ID } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet'; interface IUserFriendlyViewDescriptor { id: string; diff --git a/src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts similarity index 98% rename from src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts rename to src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts index 959717570c..935db70560 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts @@ -17,7 +17,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IAddedViewDescriptorRef } from 'vs/workbench/browser/parts/views/views'; import { ViewletPanel } from 'vs/workbench/browser/parts/views/panelViewlet'; -import { ConnectionViewletPanel } from 'sql/workbench/parts/dataExplorer/browser/connectionViewletPanel'; +import { ConnectionViewletPanel } from 'sql/workbench/contrib/dataExplorer/browser/connectionViewletPanel'; import { Extensions as ViewContainerExtensions, IViewDescriptor, IViewsRegistry, IViewContainersRegistry } from 'vs/workbench/common/views'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/extensionActions.ts b/src/sql/workbench/contrib/dataExplorer/browser/extensionActions.ts similarity index 97% rename from src/sql/workbench/parts/dataExplorer/browser/extensionActions.ts rename to src/sql/workbench/contrib/dataExplorer/browser/extensionActions.ts index d550e5896a..2d81833e49 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/extensionActions.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/extensionActions.ts @@ -6,7 +6,7 @@ import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import * as azdata from 'azdata'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/extensions.contribution.ts b/src/sql/workbench/contrib/dataExplorer/browser/extensions.contribution.ts similarity index 94% rename from src/sql/workbench/parts/dataExplorer/browser/extensions.contribution.ts rename to src/sql/workbench/contrib/dataExplorer/browser/extensions.contribution.ts index 1295a97721..6cfa4dde0a 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/extensions.contribution.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/extensions.contribution.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { DATA_TIER_WIZARD_COMMAND_ID, PROFILER_COMMAND_ID, IMPORT_COMMAND_ID, SCHEMA_COMPARE_COMMAND_ID, GENERATE_SCRIPTS_COMMAND_ID, PROPERTIES_COMMAND_ID } from 'sql/workbench/parts/dataExplorer/browser/extensionActions'; +import { DATA_TIER_WIZARD_COMMAND_ID, PROFILER_COMMAND_ID, IMPORT_COMMAND_ID, SCHEMA_COMPARE_COMMAND_ID, GENERATE_SCRIPTS_COMMAND_ID, PROPERTIES_COMMAND_ID } from 'sql/workbench/contrib/dataExplorer/browser/extensionActions'; import { ContextKeyExpr, ContextKeyRegexExpr } from 'vs/platform/contextkey/common/contextkey'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { localize } from 'vs/nls'; import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/collapsed-dark.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/collapsed-dark.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/collapsed-dark.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/collapsed-dark.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/connected_active_server.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/connected_active_server.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/connected_active_server_inverse.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server_inverse.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/connected_active_server_inverse.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/connected_active_server_inverse.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/connectionViewletPanel.css b/src/sql/workbench/contrib/dataExplorer/browser/media/connectionViewletPanel.css similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/connectionViewletPanel.css rename to src/sql/workbench/contrib/dataExplorer/browser/media/connectionViewletPanel.css diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/dataExplorer.contribution.css b/src/sql/workbench/contrib/dataExplorer/browser/media/dataExplorer.contribution.css similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/dataExplorer.contribution.css rename to src/sql/workbench/contrib/dataExplorer/browser/media/dataExplorer.contribution.css diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/default_server.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/default_server.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/default_server.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/default_server.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/default_server_inverse.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/default_server_inverse.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/default_server_inverse.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/default_server_inverse.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/disconnected_server.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/disconnected_server.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/disconnected_server.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/disconnected_server.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/disconnected_server_inverse.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/disconnected_server_inverse.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/disconnected_server_inverse.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/disconnected_server_inverse.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/expanded-dark.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/expanded-dark.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/expanded-dark.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/expanded-dark.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/media/server_page_inverse.svg b/src/sql/workbench/contrib/dataExplorer/browser/media/server_page_inverse.svg similarity index 100% rename from src/sql/workbench/parts/dataExplorer/browser/media/server_page_inverse.svg rename to src/sql/workbench/contrib/dataExplorer/browser/media/server_page_inverse.svg diff --git a/src/sql/workbench/parts/dataExplorer/browser/mssqlNodeContext.ts b/src/sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext.ts similarity index 97% rename from src/sql/workbench/parts/dataExplorer/browser/mssqlNodeContext.ts rename to src/sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext.ts index 49548028ad..4b9cb2922c 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/mssqlNodeContext.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; -import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; +import { INodeContextValue } from 'sql/workbench/contrib/dataExplorer/browser/nodeContext'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { Disposable } from 'vs/base/common/lifecycle'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { ExtensionNodeType, DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes'; import { isWindows } from 'vs/base/common/platform'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution.ts b/src/sql/workbench/contrib/dataExplorer/browser/nodeActions.common.contribution.ts similarity index 86% rename from src/sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution.ts rename to src/sql/workbench/contrib/dataExplorer/browser/nodeActions.common.contribution.ts index 25c38843d7..9fa2bed969 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/nodeActions.common.contribution.ts @@ -10,9 +10,9 @@ import { DISCONNECT_COMMAND_ID, REFRESH_COMMAND_ID } from './nodeCommands.common'; import { ContextKeyExpr, ContextKeyNotEqualsExpr } from 'vs/platform/contextkey/common/contextkey'; -import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { NodeContextKey } from 'sql/workbench/contrib/dataExplorer/browser/nodeContext'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; // Disconnect diff --git a/src/sql/workbench/parts/dataExplorer/browser/nodeCommands.common.ts b/src/sql/workbench/contrib/dataExplorer/browser/nodeCommands.common.ts similarity index 95% rename from src/sql/workbench/parts/dataExplorer/browser/nodeCommands.common.ts rename to src/sql/workbench/contrib/dataExplorer/browser/nodeCommands.common.ts index 5e78edef01..1b815dfcb8 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/nodeCommands.common.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/nodeCommands.common.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim'; import { ICustomViewDescriptor, TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IViewsRegistry, Extensions } from 'vs/workbench/common/views'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/nodeContext.ts b/src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts similarity index 92% rename from src/sql/workbench/parts/dataExplorer/browser/nodeContext.ts rename to src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts index 14d8fb87d7..e0782328c0 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/nodeContext.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts @@ -3,13 +3,13 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; +import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/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'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; diff --git a/src/sql/workbench/parts/dataExplorer/browser/nodeContextUtils.ts b/src/sql/workbench/contrib/dataExplorer/browser/nodeContextUtils.ts similarity index 97% rename from src/sql/workbench/parts/dataExplorer/browser/nodeContextUtils.ts rename to src/sql/workbench/contrib/dataExplorer/browser/nodeContextUtils.ts index 33b800f9af..773a301347 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/nodeContextUtils.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/nodeContextUtils.ts @@ -3,14 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; +import { INodeContextValue } from 'sql/workbench/contrib/dataExplorer/browser/nodeContext'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { Disposable } from 'vs/base/common/lifecycle'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { ExtensionNodeType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { isWindows } from 'vs/base/common/platform'; diff --git a/src/sql/workbench/parts/dataExplorer/test/browser/dataExplorerViewlet.test.ts b/src/sql/workbench/contrib/dataExplorer/test/browser/dataExplorerViewlet.test.ts similarity index 100% rename from src/sql/workbench/parts/dataExplorer/test/browser/dataExplorerViewlet.test.ts rename to src/sql/workbench/contrib/dataExplorer/test/browser/dataExplorerViewlet.test.ts diff --git a/src/sql/workbench/parts/editData/browser/editData.component.html b/src/sql/workbench/contrib/editData/browser/editData.component.html similarity index 100% rename from src/sql/workbench/parts/editData/browser/editData.component.html rename to src/sql/workbench/contrib/editData/browser/editData.component.html diff --git a/src/sql/workbench/parts/editData/browser/editData.component.ts b/src/sql/workbench/contrib/editData/browser/editData.component.ts similarity index 98% rename from src/sql/workbench/parts/editData/browser/editData.component.ts rename to src/sql/workbench/contrib/editData/browser/editData.component.ts index fe0087d643..69d65513c6 100644 --- a/src/sql/workbench/parts/editData/browser/editData.component.ts +++ b/src/sql/workbench/contrib/editData/browser/editData.component.ts @@ -8,11 +8,11 @@ import 'vs/css!./media/editData'; import { ElementRef, ChangeDetectorRef, OnInit, OnDestroy, Component, Inject, forwardRef, EventEmitter } from '@angular/core'; import { VirtualizedCollection } from 'angular2-slickgrid'; -import { IGridDataSet } from 'sql/workbench/parts/grid/common/interfaces'; +import { IGridDataSet } from 'sql/workbench/contrib/grid/common/interfaces'; import * as Services from 'sql/base/browser/ui/table/formatters'; import { IEditDataComponentParams, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; -import { GridParentComponent } from 'sql/workbench/parts/editData/browser/gridParentComponent'; -import { EditDataGridActionProvider } from 'sql/workbench/parts/editData/browser/editDataGridActions'; +import { GridParentComponent } from 'sql/workbench/contrib/editData/browser/gridParentComponent'; +import { EditDataGridActionProvider } from 'sql/workbench/contrib/editData/browser/editDataGridActions'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; diff --git a/src/sql/workbench/parts/editData/browser/editData.contribution.ts b/src/sql/workbench/contrib/editData/browser/editData.contribution.ts similarity index 75% rename from src/sql/workbench/parts/editData/browser/editData.contribution.ts rename to src/sql/workbench/contrib/editData/browser/editData.contribution.ts index 82e0869a6d..d8a2a783ef 100644 --- a/src/sql/workbench/parts/editData/browser/editData.contribution.ts +++ b/src/sql/workbench/contrib/editData/browser/editData.contribution.ts @@ -3,10 +3,10 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; -import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput'; -import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor'; -import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput'; +import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor'; +import { EditDataInput } from 'sql/workbench/contrib/editData/browser/editDataInput'; +import { EditDataResultsEditor } from 'sql/workbench/contrib/editData/browser/editDataResultsEditor'; +import { EditDataResultsInput } from 'sql/workbench/contrib/editData/browser/editDataResultsInput'; import { EditorDescriptor, IEditorRegistry, Extensions } from 'vs/workbench/browser/editor'; import { Registry } from 'vs/platform/registry/common/platform'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; diff --git a/src/sql/workbench/parts/editData/browser/editData.module.ts b/src/sql/workbench/contrib/editData/browser/editData.module.ts similarity index 95% rename from src/sql/workbench/parts/editData/browser/editData.module.ts rename to src/sql/workbench/contrib/editData/browser/editData.module.ts index 4186ae0d9a..de8f5a5e28 100644 --- a/src/sql/workbench/parts/editData/browser/editData.module.ts +++ b/src/sql/workbench/contrib/editData/browser/editData.module.ts @@ -9,7 +9,7 @@ import { CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; import { SlickGrid } from 'angular2-slickgrid'; -import { EditDataComponent } from 'sql/workbench/parts/editData/browser/editData.component'; +import { EditDataComponent } from 'sql/workbench/contrib/editData/browser/editData.component'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/parts/editData/browser/editDataActions.ts b/src/sql/workbench/contrib/editData/browser/editDataActions.ts similarity index 98% rename from src/sql/workbench/parts/editData/browser/editDataActions.ts rename to src/sql/workbench/contrib/editData/browser/editDataActions.ts index c7ce93f2cf..10fbe021f4 100644 --- a/src/sql/workbench/parts/editData/browser/editDataActions.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataActions.ts @@ -8,7 +8,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; +import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor'; import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/editData/browser/editDataEditor.ts b/src/sql/workbench/contrib/editData/browser/editDataEditor.ts similarity index 97% rename from src/sql/workbench/parts/editData/browser/editDataEditor.ts rename to src/sql/workbench/contrib/editData/browser/editDataEditor.ts index 4e196f3082..06035328d9 100644 --- a/src/sql/workbench/parts/editData/browser/editDataEditor.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataEditor.ts @@ -14,10 +14,10 @@ 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 { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput'; +import { EditDataInput } from 'sql/workbench/contrib/editData/browser/editDataInput'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import * as queryContext from 'sql/workbench/parts/query/common/queryContext'; +import * as queryContext from 'sql/workbench/contrib/query/common/queryContext'; import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar'; import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { Action } from 'vs/base/common/actions'; @@ -25,14 +25,14 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/browser/editorDescriptorService'; import { RefreshTableAction, StopRefreshTableAction, ChangeMaxRowsAction, ChangeMaxRowsActionItem, ShowQueryPaneAction -} from 'sql/workbench/parts/editData/browser/editDataActions'; +} from 'sql/workbench/contrib/editData/browser/editDataActions'; import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import { IFlexibleSash, HorizontalFlexibleSash } from 'sql/workbench/parts/query/browser/flexibleSash'; -import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor'; -import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput'; +import { IFlexibleSash, HorizontalFlexibleSash } from 'sql/workbench/contrib/query/browser/flexibleSash'; +import { EditDataResultsEditor } from 'sql/workbench/contrib/editData/browser/editDataResultsEditor'; +import { EditDataResultsInput } from 'sql/workbench/contrib/editData/browser/editDataResultsInput'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService'; diff --git a/src/sql/workbench/parts/editData/browser/editDataGridActions.ts b/src/sql/workbench/contrib/editData/browser/editDataGridActions.ts similarity index 88% rename from src/sql/workbench/parts/editData/browser/editDataGridActions.ts rename to src/sql/workbench/contrib/editData/browser/editDataGridActions.ts index 373adc4e97..6fab7767ac 100644 --- a/src/sql/workbench/parts/editData/browser/editDataGridActions.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataGridActions.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IGridInfo } from 'sql/workbench/parts/grid/common/interfaces'; -import { DataService } from 'sql/workbench/parts/grid/common/dataService'; -import { GridActionProvider } from 'sql/workbench/parts/editData/common/gridActions'; +import { IGridInfo } from 'sql/workbench/contrib/grid/common/interfaces'; +import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; +import { GridActionProvider } from 'sql/workbench/contrib/editData/common/gridActions'; import { localize } from 'vs/nls'; import { IAction, Action } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/parts/editData/browser/editDataInput.ts b/src/sql/workbench/contrib/editData/browser/editDataInput.ts similarity index 98% rename from src/sql/workbench/parts/editData/browser/editDataInput.ts rename to src/sql/workbench/contrib/editData/browser/editDataInput.ts index 9794acfe1a..dc312dc1a5 100644 --- a/src/sql/workbench/parts/editData/browser/editDataInput.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataInput.ts @@ -13,7 +13,7 @@ import * as nls from 'vs/nls'; import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput'; +import { EditDataResultsInput } from 'sql/workbench/contrib/editData/browser/editDataResultsInput'; import { IEditorViewState } from 'vs/editor/common/editorCommon'; /** diff --git a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts b/src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts similarity index 92% rename from src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts rename to src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts index b1f23ba098..2faa8fde4f 100644 --- a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts @@ -16,11 +16,11 @@ import * as types from 'vs/base/common/types'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; -import { BareResultsGridInfo } from 'sql/workbench/parts/query/browser/queryResultsEditor'; +import { BareResultsGridInfo } from 'sql/workbench/contrib/query/browser/queryResultsEditor'; import { IEditDataComponentParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; -import { EditDataModule } from 'sql/workbench/parts/editData/browser/editData.module'; -import { EDITDATA_SELECTOR } from 'sql/workbench/parts/editData/browser/editData.component'; -import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput'; +import { EditDataModule } from 'sql/workbench/contrib/editData/browser/editData.module'; +import { EDITDATA_SELECTOR } from 'sql/workbench/contrib/editData/browser/editData.component'; +import { EditDataResultsInput } from 'sql/workbench/contrib/editData/browser/editDataResultsInput'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/workbench/parts/editData/browser/editDataResultsInput.ts b/src/sql/workbench/contrib/editData/browser/editDataResultsInput.ts similarity index 100% rename from src/sql/workbench/parts/editData/browser/editDataResultsInput.ts rename to src/sql/workbench/contrib/editData/browser/editDataResultsInput.ts diff --git a/src/sql/workbench/parts/editData/browser/gridCommands.ts b/src/sql/workbench/contrib/editData/browser/gridCommands.ts similarity index 93% rename from src/sql/workbench/parts/editData/browser/gridCommands.ts rename to src/sql/workbench/contrib/editData/browser/gridCommands.ts index 3eed2c5a7b..0e8e2e162f 100644 --- a/src/sql/workbench/parts/editData/browser/gridCommands.ts +++ b/src/sql/workbench/contrib/editData/browser/gridCommands.ts @@ -3,10 +3,10 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents'; +import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; -import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; +import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; +import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/sql/workbench/parts/editData/browser/gridParentComponent.ts b/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts similarity index 97% rename from src/sql/workbench/parts/editData/browser/gridParentComponent.ts rename to src/sql/workbench/contrib/editData/browser/gridParentComponent.ts index ace4245098..6b3e2be69c 100644 --- a/src/sql/workbench/parts/editData/browser/gridParentComponent.ts +++ b/src/sql/workbench/contrib/editData/browser/gridParentComponent.ts @@ -9,14 +9,14 @@ import 'vs/css!./media/styles'; import { Subscription, Subject } from 'rxjs/Rx'; import { ElementRef, QueryList, ChangeDetectorRef, ViewChildren } from '@angular/core'; import { SlickGrid } from 'angular2-slickgrid'; -import * as Constants from 'sql/workbench/parts/query/common/constants'; -import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants'; -import { IGridInfo, IGridDataSet, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; +import * as Constants from 'sql/workbench/contrib/query/common/constants'; +import * as LocalizedConstants from 'sql/workbench/contrib/query/common/localizedConstants'; +import { IGridInfo, IGridDataSet, SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import * as Utils from 'sql/platform/connection/common/utils'; -import { DataService } from 'sql/workbench/parts/grid/common/dataService'; -import * as actions from 'sql/workbench/parts/editData/common/gridActions'; -import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents'; -import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/workbench/parts/query/common/queryContext'; +import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; +import * as actions from 'sql/workbench/contrib/editData/common/gridActions'; +import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents'; +import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/workbench/contrib/query/common/queryContext'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; diff --git a/src/sql/workbench/parts/editData/browser/media/editData.css b/src/sql/workbench/contrib/editData/browser/media/editData.css similarity index 100% rename from src/sql/workbench/parts/editData/browser/media/editData.css rename to src/sql/workbench/contrib/editData/browser/media/editData.css diff --git a/src/sql/workbench/parts/editData/browser/media/flexbox.css b/src/sql/workbench/contrib/editData/browser/media/flexbox.css similarity index 100% rename from src/sql/workbench/parts/editData/browser/media/flexbox.css rename to src/sql/workbench/contrib/editData/browser/media/flexbox.css diff --git a/src/sql/workbench/parts/editData/browser/media/styles.css b/src/sql/workbench/contrib/editData/browser/media/styles.css similarity index 100% rename from src/sql/workbench/parts/editData/browser/media/styles.css rename to src/sql/workbench/contrib/editData/browser/media/styles.css diff --git a/src/sql/workbench/parts/editData/common/gridActions.ts b/src/sql/workbench/contrib/editData/common/gridActions.ts similarity index 96% rename from src/sql/workbench/parts/editData/common/gridActions.ts rename to src/sql/workbench/contrib/editData/common/gridActions.ts index 415f45dcbe..feb54d9b8c 100644 --- a/src/sql/workbench/parts/editData/common/gridActions.ts +++ b/src/sql/workbench/contrib/editData/common/gridActions.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IGridInfo, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; -import { DataService } from 'sql/workbench/parts/grid/common/dataService'; +import { IGridInfo, SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; +import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; import { localize } from 'vs/nls'; import { IAction, Action } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/parts/extensions/browser/contributionRenders.ts b/src/sql/workbench/contrib/extensions/browser/contributionRenders.ts similarity index 93% rename from src/sql/workbench/parts/extensions/browser/contributionRenders.ts rename to src/sql/workbench/contrib/extensions/browser/contributionRenders.ts index f2946db552..5fe863ad9c 100644 --- a/src/sql/workbench/parts/extensions/browser/contributionRenders.ts +++ b/src/sql/workbench/contrib/extensions/browser/contributionRenders.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { append, $ } from 'vs/base/browser/dom'; -import { IInsightTypeContrib } from 'sql/workbench/parts/dashboard/browser/widgets/insights/interfaces'; -import { IDashboardTabContrib } from 'sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution'; +import { IInsightTypeContrib } from 'sql/workbench/contrib/dashboard/browser/widgets/insights/interfaces'; +import { IDashboardTabContrib } from 'sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution'; import { localize } from 'vs/nls'; import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; diff --git a/src/sql/workbench/parts/grid/common/dataService.ts b/src/sql/workbench/contrib/grid/common/dataService.ts similarity index 96% rename from src/sql/workbench/parts/grid/common/dataService.ts rename to src/sql/workbench/contrib/grid/common/dataService.ts index 59d3eb0f58..ca1c3bde87 100644 --- a/src/sql/workbench/parts/grid/common/dataService.ts +++ b/src/sql/workbench/contrib/grid/common/dataService.ts @@ -7,8 +7,8 @@ import { Subject } from 'rxjs/Subject'; import { EditUpdateCellResult, EditSubsetResult, EditCreateRowResult } from 'azdata'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { ResultSerializer } from 'sql/workbench/parts/query/common/resultSerializer'; -import { ISaveRequest } from 'sql/workbench/parts/grid/common/interfaces'; +import { ResultSerializer } from 'sql/workbench/contrib/query/common/resultSerializer'; +import { ISaveRequest } from 'sql/workbench/contrib/grid/common/interfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/parts/grid/common/gridContentEvents.ts b/src/sql/workbench/contrib/grid/common/gridContentEvents.ts similarity index 100% rename from src/sql/workbench/parts/grid/common/gridContentEvents.ts rename to src/sql/workbench/contrib/grid/common/gridContentEvents.ts diff --git a/src/sql/workbench/parts/grid/common/interfaces.ts b/src/sql/workbench/contrib/grid/common/interfaces.ts similarity index 100% rename from src/sql/workbench/parts/grid/common/interfaces.ts rename to src/sql/workbench/contrib/grid/common/interfaces.ts diff --git a/src/sql/workbench/parts/jobManagement/browser/agentView.component.html b/src/sql/workbench/contrib/jobManagement/browser/agentView.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/agentView.component.html rename to src/sql/workbench/contrib/jobManagement/browser/agentView.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/agentView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/agentView.component.ts similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/agentView.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/agentView.component.ts diff --git a/src/sql/workbench/parts/jobManagement/browser/alertsView.component.html b/src/sql/workbench/contrib/jobManagement/browser/alertsView.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/alertsView.component.html rename to src/sql/workbench/contrib/jobManagement/browser/alertsView.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/alertsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts similarity index 97% rename from src/sql/workbench/parts/jobManagement/browser/alertsView.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts index bcc3df365a..d96fe1c0c7 100644 --- a/src/sql/workbench/parts/jobManagement/browser/alertsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts @@ -11,10 +11,10 @@ import * as azdata from 'azdata'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/browser/jobActions'; -import { JobManagementView } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/jobManagement/browser/jobHistory.component.html b/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/jobHistory.component.html rename to src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts b/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts similarity index 98% rename from src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts index 4d96fd5eac..7ce291118a 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts @@ -10,7 +10,7 @@ import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/browser/jobActions'; import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; @@ -19,15 +19,15 @@ import { IJobManagementService } from 'sql/platform/jobManagement/common/interfa import { JobHistoryController, JobHistoryDataSource, JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow -} from 'sql/workbench/parts/jobManagement/browser/jobHistoryTree'; -import { JobStepsViewRow } from 'sql/workbench/parts/jobManagement/browser/jobStepsViewTree'; +} from 'sql/workbench/contrib/jobManagement/browser/jobHistoryTree'; +import { JobStepsViewRow } from 'sql/workbench/contrib/jobManagement/browser/jobStepsViewTree'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { attachListStyler } from 'vs/platform/theme/common/styler'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { JobManagementView, JobActionContext } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/workbench/parts/jobManagement/browser/jobHistoryTree.ts b/src/sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/jobHistoryTree.ts rename to src/sql/workbench/contrib/jobManagement/browser/jobHistoryTree.ts diff --git a/src/sql/workbench/parts/jobManagement/browser/jobManagementView.ts b/src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts similarity index 98% rename from src/sql/workbench/parts/jobManagement/browser/jobManagementView.ts rename to src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts index ced1e2f38d..fd32092fc9 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobManagementView.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts @@ -6,7 +6,7 @@ import * as azdata from 'azdata'; import { ElementRef, AfterContentChecked, ViewChild } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IAction, Action } from 'vs/base/common/actions'; import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; diff --git a/src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.html b/src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.html rename to src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts similarity index 95% rename from src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts index f4f84d7d1d..39abdc1d59 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobStepsView.component.ts @@ -15,9 +15,9 @@ import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser import { JobStepsViewController, JobStepsViewDataSource, JobStepsViewFilter, JobStepsViewRenderer, JobStepsViewModel -} from 'sql/workbench/parts/jobManagement/browser/jobStepsViewTree'; -import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/browser/jobHistory.component'; -import { JobManagementView } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +} from 'sql/workbench/contrib/jobManagement/browser/jobStepsViewTree'; +import { JobHistoryComponent } from 'sql/workbench/contrib/jobManagement/browser/jobHistory.component'; +import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/jobManagement/browser/jobStepsViewTree.ts b/src/sql/workbench/contrib/jobManagement/browser/jobStepsViewTree.ts similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/jobStepsViewTree.ts rename to src/sql/workbench/contrib/jobManagement/browser/jobStepsViewTree.ts diff --git a/src/sql/workbench/parts/jobManagement/browser/jobsView.component.html b/src/sql/workbench/contrib/jobManagement/browser/jobsView.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/jobsView.component.html rename to src/sql/workbench/contrib/jobManagement/browser/jobsView.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts similarity index 99% rename from src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts index 20a3efb6aa..db08ac8979 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts @@ -11,14 +11,14 @@ import * as dom from 'vs/base/browser/dom'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { EditJobAction, DeleteJobAction, NewJobAction, RunJobAction } from 'sql/platform/jobManagement/browser/jobActions'; import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities'; import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { JobManagementView, JobActionContext } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/jobManagement/browser/media/NotebookError_16x.svg b/src/sql/workbench/contrib/jobManagement/browser/media/NotebookError_16x.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/NotebookError_16x.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/NotebookError_16x.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/NotebookError_16x_white.svg b/src/sql/workbench/contrib/jobManagement/browser/media/NotebookError_16x_white.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/NotebookError_16x_white.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/NotebookError_16x_white.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/NotebookFail_16x.svg b/src/sql/workbench/contrib/jobManagement/browser/media/NotebookFail_16x.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/NotebookFail_16x.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/NotebookFail_16x.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/NotebookFail_16x_white.svg b/src/sql/workbench/contrib/jobManagement/browser/media/NotebookFail_16x_white.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/NotebookFail_16x_white.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/NotebookFail_16x_white.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/NotebookSuccess_16x.svg b/src/sql/workbench/contrib/jobManagement/browser/media/NotebookSuccess_16x.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/NotebookSuccess_16x.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/NotebookSuccess_16x.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/NotebookSuccess_16x_white.svg b/src/sql/workbench/contrib/jobManagement/browser/media/NotebookSuccess_16x_white.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/NotebookSuccess_16x_white.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/NotebookSuccess_16x_white.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/alert.svg b/src/sql/workbench/contrib/jobManagement/browser/media/alert.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/alert.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/alert.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/alert_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/alert_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/alert_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/alert_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/back.svg b/src/sql/workbench/contrib/jobManagement/browser/media/back.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/back.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/back.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/back_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/back_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/back_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/back_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/detailview.css b/src/sql/workbench/contrib/jobManagement/browser/media/detailview.css similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/detailview.css rename to src/sql/workbench/contrib/jobManagement/browser/media/detailview.css diff --git a/src/sql/workbench/parts/jobManagement/browser/media/edit.svg b/src/sql/workbench/contrib/jobManagement/browser/media/edit.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/edit.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/edit.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/edit_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/edit_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/edit_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/edit_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/failed.svg b/src/sql/workbench/contrib/jobManagement/browser/media/failed.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/failed.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/failed.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/job.svg b/src/sql/workbench/contrib/jobManagement/browser/media/job.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/job.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/job.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/jobHistory.css b/src/sql/workbench/contrib/jobManagement/browser/media/jobHistory.css similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/jobHistory.css rename to src/sql/workbench/contrib/jobManagement/browser/media/jobHistory.css diff --git a/src/sql/workbench/parts/jobManagement/browser/media/jobStepsView.css b/src/sql/workbench/contrib/jobManagement/browser/media/jobStepsView.css similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/jobStepsView.css rename to src/sql/workbench/contrib/jobManagement/browser/media/jobStepsView.css diff --git a/src/sql/workbench/parts/jobManagement/browser/media/job_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/job_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/job_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/job_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/jobs.css b/src/sql/workbench/contrib/jobManagement/browser/media/jobs.css similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/jobs.css rename to src/sql/workbench/contrib/jobManagement/browser/media/jobs.css diff --git a/src/sql/workbench/parts/jobManagement/browser/media/new.svg b/src/sql/workbench/contrib/jobManagement/browser/media/new.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/new.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/new.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/new_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/new_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/new_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/new_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/notebook.svg b/src/sql/workbench/contrib/jobManagement/browser/media/notebook.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/notebook.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/notebook.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/notebook_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/notebook_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/notebook_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/notebook_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/open_notebook.svg b/src/sql/workbench/contrib/jobManagement/browser/media/open_notebook.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/open_notebook.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/open_notebook.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/open_notebook_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/open_notebook_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/open_notebook_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/open_notebook_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/operator.svg b/src/sql/workbench/contrib/jobManagement/browser/media/operator.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/operator.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/operator.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/operator_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/operator_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/operator_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/operator_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/proxy.svg b/src/sql/workbench/contrib/jobManagement/browser/media/proxy.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/proxy.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/proxy.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/proxy_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/proxy_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/proxy_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/proxy_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/refresh.svg b/src/sql/workbench/contrib/jobManagement/browser/media/refresh.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/refresh.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/refresh.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/refresh_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/refresh_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/refresh_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/refresh_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/status_error.svg b/src/sql/workbench/contrib/jobManagement/browser/media/status_error.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/status_error.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/status_error.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/status_success.svg b/src/sql/workbench/contrib/jobManagement/browser/media/status_success.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/status_success.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/status_success.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/step.svg b/src/sql/workbench/contrib/jobManagement/browser/media/step.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/step.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/step.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/step_inverse.svg b/src/sql/workbench/contrib/jobManagement/browser/media/step_inverse.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/step_inverse.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/step_inverse.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/media/success_complete.svg b/src/sql/workbench/contrib/jobManagement/browser/media/success_complete.svg similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/media/success_complete.svg rename to src/sql/workbench/contrib/jobManagement/browser/media/success_complete.svg diff --git a/src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.html b/src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.html rename to src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.ts b/src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts similarity index 98% rename from src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts index 19c7674cd9..b0a625b512 100644 --- a/src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts @@ -10,16 +10,16 @@ import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { RunJobAction, StopJobAction, JobsRefreshAction, EditNotebookJobAction, OpenMaterializedNotebookAction, OpenTemplateNotebookAction, RenameNotebookMaterializedAction, PinNotebookMaterializedAction, UnpinNotebookMaterializedAction, DeleteMaterializedNotebookAction } from 'sql/platform/jobManagement/browser/jobActions'; import { NotebookCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { JobStepsViewRow } from 'sql/workbench/parts/jobManagement/browser/jobStepsViewTree'; +import { JobStepsViewRow } from 'sql/workbench/contrib/jobManagement/browser/jobStepsViewTree'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IAction } from 'vs/base/common/actions'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { JobManagementView, JobActionContext } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; diff --git a/src/sql/workbench/parts/jobManagement/browser/notebooksView.component.html b/src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/notebooksView.component.html rename to src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/notebooksView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts similarity index 99% rename from src/sql/workbench/parts/jobManagement/browser/notebooksView.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts index 29e2f2577e..cf2a9297ff 100644 --- a/src/sql/workbench/parts/jobManagement/browser/notebooksView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts @@ -11,14 +11,14 @@ import * as dom from 'vs/base/browser/dom'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; import { NotebookCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { NewNotebookJobAction, RunJobAction, EditNotebookJobAction, JobsRefreshAction, IJobActionInfo, DeleteNotebookAction, OpenLatestRunMaterializedNotebook } from 'sql/platform/jobManagement/browser/jobActions'; import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities'; import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { JobManagementView, JobActionContext } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/jobManagement/browser/operatorsView.component.html b/src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/operatorsView.component.html rename to src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/operatorsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts similarity index 97% rename from src/sql/workbench/parts/jobManagement/browser/operatorsView.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts index 12f16ed14f..35d8ce038c 100644 --- a/src/sql/workbench/parts/jobManagement/browser/operatorsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts @@ -10,10 +10,10 @@ import * as nls from 'vs/nls'; import * as azdata from 'azdata'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/platform/jobManagement/browser/jobActions'; -import { JobManagementView } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { ICommandService } from 'vs/platform/commands/common/commands'; diff --git a/src/sql/workbench/parts/jobManagement/browser/proxiesView.component.html b/src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.html similarity index 100% rename from src/sql/workbench/parts/jobManagement/browser/proxiesView.component.html rename to src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.html diff --git a/src/sql/workbench/parts/jobManagement/browser/proxiesView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts similarity index 97% rename from src/sql/workbench/parts/jobManagement/browser/proxiesView.component.ts rename to src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts index 37a07d41f9..5ad17a320d 100644 --- a/src/sql/workbench/parts/jobManagement/browser/proxiesView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts @@ -10,12 +10,12 @@ import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/platform/jobManagement/browser/jobActions'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { JobManagementView } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; +import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IAction } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/parts/notebook/browser/cellToggleMoreActions.ts b/src/sql/workbench/contrib/notebook/browser/cellToggleMoreActions.ts similarity index 93% rename from src/sql/workbench/parts/notebook/browser/cellToggleMoreActions.ts rename to src/sql/workbench/contrib/notebook/browser/cellToggleMoreActions.ts index 92e2e8c892..86d433d196 100644 --- a/src/sql/workbench/parts/notebook/browser/cellToggleMoreActions.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellToggleMoreActions.ts @@ -13,12 +13,12 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/ import * as DOM from 'vs/base/browser/dom'; import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; -import { CellActionBase, CellContext } from 'sql/workbench/parts/notebook/browser/cellViews/codeActions'; -import { CellTypes, CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { ToggleMoreWidgetAction } from 'sql/workbench/parts/dashboard/browser/core/actions'; -import { CellModel } from 'sql/workbench/parts/notebook/browser/models/cell'; +import { CellActionBase, CellContext } from 'sql/workbench/contrib/notebook/browser/cellViews/codeActions'; +import { CellTypes, CellType } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { ToggleMoreWidgetAction } from 'sql/workbench/contrib/dashboard/browser/core/actions'; +import { CellModel } from 'sql/workbench/contrib/notebook/browser/models/cell'; import { Action } from 'vs/base/common/actions'; import { firstIndex } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/code.component.html b/src/sql/workbench/contrib/notebook/browser/cellViews/code.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/code.component.html rename to src/sql/workbench/contrib/notebook/browser/cellViews/code.component.html diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/code.component.ts similarity index 95% rename from src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/code.component.ts index 73b570c2ca..abf9734df1 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/code.component.ts @@ -8,11 +8,11 @@ import { OnInit, Component, Input, Inject, ElementRef, ViewChild, Output, EventE import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { QueryTextEditor } from 'sql/workbench/browser/modelComponents/queryTextEditor'; -import { CellToggleMoreActions } from 'sql/workbench/parts/notebook/browser/cellToggleMoreActions'; -import { ICellModel, notebookConstants, CellExecutionState } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { CellToggleMoreActions } from 'sql/workbench/contrib/notebook/browser/cellToggleMoreActions'; +import { ICellModel, notebookConstants, CellExecutionState } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { RunCellAction, CellContext } from 'sql/workbench/parts/notebook/browser/cellViews/codeActions'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { RunCellAction, CellContext } from 'sql/workbench/contrib/notebook/browser/cellViews/codeActions'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import * as themeColors from 'vs/workbench/common/theme'; @@ -27,13 +27,13 @@ import { IModeService } from 'vs/editor/common/services/modeService'; import { IModelService } from 'vs/editor/common/services/modelService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { Event, Emitter } from 'vs/base/common/event'; -import { CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { CellTypes } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { OVERRIDE_EDITOR_THEMING_SETTING } from 'sql/workbench/services/notebook/browser/notebookService'; -import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import * as notebookUtils from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ILogService } from 'vs/platform/log/common/log'; -import { CollapseComponent } from 'sql/workbench/parts/notebook/browser/cellViews/collapse.component'; +import { CollapseComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/collapse.component'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; export const CODE_SELECTOR: string = 'code-component'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/code.css b/src/sql/workbench/contrib/notebook/browser/cellViews/code.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/code.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/code.css diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/codeActions.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/codeActions.ts similarity index 95% rename from src/sql/workbench/parts/notebook/browser/cellViews/codeActions.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/codeActions.ts index 48bde437be..fdd003281c 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/codeActions.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/codeActions.ts @@ -9,10 +9,10 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import * as types from 'vs/base/common/types'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; -import { ICellModel, CellExecutionState } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; +import { ICellModel, CellExecutionState } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { MultiStateAction, IMultiStateData } from 'sql/workbench/parts/notebook/browser/notebookActions'; +import { MultiStateAction, IMultiStateData } from 'sql/workbench/contrib/notebook/browser/notebookActions'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ILogService } from 'vs/platform/log/common/log'; import { getErrorMessage } from 'vs/base/common/errors'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.html b/src/sql/workbench/contrib/notebook/browser/cellViews/codeCell.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.html rename to src/sql/workbench/contrib/notebook/browser/cellViews/codeCell.component.html diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/codeCell.component.ts similarity index 92% rename from src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/codeCell.component.ts index c94bc66dc6..ed46b33fcd 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/codeCell.component.ts @@ -5,9 +5,9 @@ import { nb } from 'azdata'; import { OnInit, Component, Input, Inject, forwardRef, ChangeDetectorRef, SimpleChange, OnChanges, HostListener } from '@angular/core'; -import { CellView } from 'sql/workbench/parts/notebook/browser/cellViews/interfaces'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { CellView } from 'sql/workbench/contrib/notebook/browser/cellViews/interfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; import { Deferred } from 'sql/base/common/promise'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/collapse.component.html b/src/sql/workbench/contrib/notebook/browser/cellViews/collapse.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/collapse.component.html rename to src/sql/workbench/contrib/notebook/browser/cellViews/collapse.component.html diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/collapse.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/collapse.component.ts similarity index 92% rename from src/sql/workbench/parts/notebook/browser/cellViews/collapse.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/collapse.component.ts index 6b6b2353b1..4bc08acac8 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/collapse.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/collapse.component.ts @@ -5,8 +5,8 @@ import 'vs/css!./code'; import { OnInit, Component, Input, ElementRef, ViewChild, SimpleChange, OnChanges } from '@angular/core'; -import { CellView } from 'sql/workbench/parts/notebook/browser/cellViews/interfaces'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { CellView } from 'sql/workbench/contrib/notebook/browser/cellViews/interfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; export const COLLAPSE_SELECTOR: string = 'collapse-component'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/interfaces.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/interfaces.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/interfaces.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/interfaces.ts diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/linkHandler.directive.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/linkHandler.directive.ts diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/dark/chevron_down_inverse.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/chevron_down_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/dark/chevron_down_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/chevron_down_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/dark/chevron_up_inverse.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/chevron_up_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/dark/chevron_up_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/chevron_up_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/dark/execute_cell_inverse.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/execute_cell_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/dark/execute_cell_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/execute_cell_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/dark/stop_cell_solidanimation_inverse.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/stop_cell_solidanimation_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/dark/stop_cell_solidanimation_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/dark/stop_cell_solidanimation_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/highlight.css b/src/sql/workbench/contrib/notebook/browser/cellViews/media/highlight.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/highlight.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/highlight.css diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/light/chevron_down.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/light/chevron_down.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/light/chevron_down.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/light/chevron_down.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/light/chevron_up.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/light/chevron_up.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/light/chevron_up.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/light/chevron_up.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/light/execute_cell.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/light/execute_cell.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/light/execute_cell.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/light/execute_cell.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/light/execute_cell_error.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/light/execute_cell_error.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/light/execute_cell_error.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/light/execute_cell_error.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/light/stop_cell_solidanimation.svg b/src/sql/workbench/contrib/notebook/browser/cellViews/media/light/stop_cell_solidanimation.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/light/stop_cell_solidanimation.svg rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/light/stop_cell_solidanimation.svg diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/markdown.css b/src/sql/workbench/contrib/notebook/browser/cellViews/media/markdown.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/markdown.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/markdown.css diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/media/output.css b/src/sql/workbench/contrib/notebook/browser/cellViews/media/output.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/media/output.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/media/output.css diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/output.component.html b/src/sql/workbench/contrib/notebook/browser/cellViews/output.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/output.component.html rename to src/sql/workbench/contrib/notebook/browser/cellViews/output.component.html diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/output.component.ts similarity index 94% rename from src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/output.component.ts index daccdcba78..c9bb82a79b 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/output.component.ts @@ -9,12 +9,12 @@ import { OnInit, Component, Input, Inject, ElementRef, ViewChild, SimpleChange, import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { Event } from 'vs/base/common/event'; import { nb } from 'azdata'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import * as outputProcessor from 'sql/workbench/parts/notebook/browser/models/outputProcessor'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import * as outputProcessor from 'sql/workbench/contrib/notebook/browser/models/outputProcessor'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import * as DOM from 'vs/base/browser/dom'; -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; -import { Extensions, IMimeComponent, IMimeComponentRegistry } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; +import { Extensions, IMimeComponent, IMimeComponentRegistry } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as themeColors from 'vs/workbench/common/theme'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.html b/src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.html rename to src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.component.html diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.component.ts similarity index 96% rename from src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.component.ts index e28b2b8dc3..5739d763c0 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.component.ts @@ -6,7 +6,7 @@ import 'vs/css!./code'; import 'vs/css!./outputArea'; import { OnInit, Component, Input, Inject, ElementRef, ViewChild, forwardRef, ChangeDetectorRef } from '@angular/core'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import * as themeColors from 'vs/workbench/common/theme'; import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.css b/src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/outputArea.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/outputArea.css diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/placeholder.css b/src/sql/workbench/contrib/notebook/browser/cellViews/placeholder.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/placeholder.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/placeholder.css diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.html b/src/sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.html rename to src/sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component.html diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component.ts similarity index 84% rename from src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component.ts index fa051b990e..18c3287d86 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component.ts @@ -5,11 +5,11 @@ import 'vs/css!./placeholder'; import { OnInit, Component, Input, Inject, forwardRef, ChangeDetectorRef, SimpleChange, OnChanges } from '@angular/core'; -import { CellView } from 'sql/workbench/parts/notebook/browser/cellViews/interfaces'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { CellView } from 'sql/workbench/contrib/notebook/browser/cellViews/interfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; import { localize } from 'vs/nls'; -import { CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { CellType } from 'sql/workbench/contrib/notebook/common/models/contracts'; export const PLACEHOLDER_SELECTOR: string = 'placeholder-cell-component'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/stdin.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/stdin.component.ts similarity index 96% rename from src/sql/workbench/parts/notebook/browser/cellViews/stdin.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/stdin.component.ts index 5805188ee9..bc46af8530 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/stdin.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/stdin.component.ts @@ -23,7 +23,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { attachInputBoxStyler } from 'sql/platform/theme/common/styler'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { Deferred } from 'sql/base/common/promise'; -import { ICellModel, CellExecutionState } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ICellModel, CellExecutionState } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; export const STDIN_SELECTOR: string = 'stdin-component'; @Component({ diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/stdin.css b/src/sql/workbench/contrib/notebook/browser/cellViews/stdin.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/stdin.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/stdin.css diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.html b/src/sql/workbench/contrib/notebook/browser/cellViews/textCell.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.html rename to src/sql/workbench/contrib/notebook/browser/cellViews/textCell.component.html diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.ts b/src/sql/workbench/contrib/notebook/browser/cellViews/textCell.component.ts similarity index 93% rename from src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.ts rename to src/sql/workbench/contrib/notebook/browser/cellViews/textCell.component.ts index e536563da4..80e90c5c5c 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/cellViews/textCell.component.ts @@ -20,13 +20,13 @@ import * as DOM from 'vs/base/browser/dom'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { toDisposable } from 'vs/base/common/lifecycle'; import { IMarkdownRenderResult } from 'vs/editor/contrib/markdown/markdownRenderer'; -import { NotebookMarkdownRenderer } from 'sql/workbench/parts/notebook/browser/outputs/notebookMarkdown'; -import { CellView } from 'sql/workbench/parts/notebook/browser/cellViews/interfaces'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; -import { ISanitizer, defaultSanitizer } from 'sql/workbench/parts/notebook/browser/outputs/sanitizer'; -import { CellToggleMoreActions } from 'sql/workbench/parts/notebook/browser/cellToggleMoreActions'; -import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { NotebookMarkdownRenderer } from 'sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown'; +import { CellView } from 'sql/workbench/contrib/notebook/browser/cellViews/interfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; +import { ISanitizer, defaultSanitizer } from 'sql/workbench/contrib/notebook/browser/outputs/sanitizer'; +import { CellToggleMoreActions } from 'sql/workbench/contrib/notebook/browser/cellToggleMoreActions'; +import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; export const TEXT_SELECTOR: string = 'text-cell-component'; const USER_SELECT_CLASS = 'actionselect'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/textCell.css b/src/sql/workbench/contrib/notebook/browser/cellViews/textCell.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/cellViews/textCell.css rename to src/sql/workbench/contrib/notebook/browser/cellViews/textCell.css diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/add_blue_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/add_blue_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/add_blue_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/add_blue_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/add_code_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/add_code_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/add_code_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/add_code_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/add_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/add_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/add_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/add_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/add_text_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/add_text_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/add_text_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/add_text_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/clear_results_blue_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/clear_results_blue_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/clear_results_blue_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/clear_results_blue_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/clear_results_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/clear_results_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/clear_results_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/clear_results_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/hide_code_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/hide_code_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/hide_code_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/hide_code_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/new_notebook_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/new_notebook_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/new_notebook_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/new_notebook_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/nottrusted_blue_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/nottrusted_blue_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/nottrusted_blue_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/nottrusted_blue_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/nottrusted_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/nottrusted_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/nottrusted_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/nottrusted_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/run_cells_blue_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/run_cells_blue_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/run_cells_blue_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/run_cells_blue_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/run_cells_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/run_cells_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/run_cells_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/run_cells_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/show_code_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/show_code_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/show_code_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/show_code_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/stop_cell_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/stop_cell_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/stop_cell_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/stop_cell_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/trusted_blue_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/trusted_blue_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/trusted_blue_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/trusted_blue_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/dark/trusted_inverse.svg b/src/sql/workbench/contrib/notebook/browser/media/dark/trusted_inverse.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/dark/trusted_inverse.svg rename to src/sql/workbench/contrib/notebook/browser/media/dark/trusted_inverse.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/add.svg b/src/sql/workbench/contrib/notebook/browser/media/light/add.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/add.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/add.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/add_blue.svg b/src/sql/workbench/contrib/notebook/browser/media/light/add_blue.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/add_blue.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/add_blue.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/add_code.svg b/src/sql/workbench/contrib/notebook/browser/media/light/add_code.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/add_code.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/add_code.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/add_text.svg b/src/sql/workbench/contrib/notebook/browser/media/light/add_text.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/add_text.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/add_text.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/clear_results.svg b/src/sql/workbench/contrib/notebook/browser/media/light/clear_results.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/clear_results.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/clear_results.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/clear_results_blue.svg b/src/sql/workbench/contrib/notebook/browser/media/light/clear_results_blue.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/clear_results_blue.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/clear_results_blue.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/hide_code.svg b/src/sql/workbench/contrib/notebook/browser/media/light/hide_code.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/hide_code.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/hide_code.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/new_notebook.svg b/src/sql/workbench/contrib/notebook/browser/media/light/new_notebook.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/new_notebook.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/new_notebook.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/nottrusted.svg b/src/sql/workbench/contrib/notebook/browser/media/light/nottrusted.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/nottrusted.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/nottrusted.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/nottrusted_blue.svg b/src/sql/workbench/contrib/notebook/browser/media/light/nottrusted_blue.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/nottrusted_blue.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/nottrusted_blue.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/run_cells.svg b/src/sql/workbench/contrib/notebook/browser/media/light/run_cells.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/run_cells.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/run_cells.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/run_cells_blue.svg b/src/sql/workbench/contrib/notebook/browser/media/light/run_cells_blue.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/run_cells_blue.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/run_cells_blue.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/show_code.svg b/src/sql/workbench/contrib/notebook/browser/media/light/show_code.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/show_code.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/show_code.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/stop_cell.svg b/src/sql/workbench/contrib/notebook/browser/media/light/stop_cell.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/stop_cell.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/stop_cell.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/trusted.svg b/src/sql/workbench/contrib/notebook/browser/media/light/trusted.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/trusted.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/trusted.svg diff --git a/src/sql/workbench/parts/notebook/browser/media/light/trusted_blue.svg b/src/sql/workbench/contrib/notebook/browser/media/light/trusted_blue.svg similarity index 100% rename from src/sql/workbench/parts/notebook/browser/media/light/trusted_blue.svg rename to src/sql/workbench/contrib/notebook/browser/media/light/trusted_blue.svg diff --git a/src/sql/workbench/parts/notebook/browser/models/cell.ts b/src/sql/workbench/contrib/notebook/browser/models/cell.ts similarity index 98% rename from src/sql/workbench/parts/notebook/browser/models/cell.ts rename to src/sql/workbench/contrib/notebook/browser/models/cell.ts index 24f852d3ba..abc61231f4 100644 --- a/src/sql/workbench/parts/notebook/browser/models/cell.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/cell.ts @@ -9,10 +9,10 @@ import { Event, Emitter } from 'vs/base/common/event'; import { URI } from 'vs/base/common/uri'; import { localize } from 'vs/nls'; -import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; -import { CellTypes, CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; -import { ICellModel, notebookConstants, IOutputChangedEvent, FutureInternal, CellExecutionState, ICellModelOptions } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import * as notebookUtils from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; +import { CellTypes, CellType, NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; +import { ICellModel, notebookConstants, IOutputChangedEvent, FutureInternal, CellExecutionState, ICellModelOptions } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; diff --git a/src/sql/workbench/parts/notebook/browser/models/cellMagicMapper.ts b/src/sql/workbench/contrib/notebook/browser/models/cellMagicMapper.ts similarity index 95% rename from src/sql/workbench/parts/notebook/browser/models/cellMagicMapper.ts rename to src/sql/workbench/contrib/notebook/browser/models/cellMagicMapper.ts index edbea3de7f..c9ee71d99b 100644 --- a/src/sql/workbench/parts/notebook/browser/models/cellMagicMapper.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/cellMagicMapper.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ICellMagicMapper } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ICellMagicMapper } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { ILanguageMagic } from 'sql/workbench/services/notebook/browser/notebookService'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/notebook/browser/models/clientSession.ts b/src/sql/workbench/contrib/notebook/browser/models/clientSession.ts similarity index 99% rename from src/sql/workbench/parts/notebook/browser/models/clientSession.ts rename to src/sql/workbench/contrib/notebook/browser/models/clientSession.ts index b290d704cd..bcb73844f8 100644 --- a/src/sql/workbench/parts/notebook/browser/models/clientSession.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/clientSession.ts @@ -11,7 +11,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { localize } from 'vs/nls'; import { getErrorMessage } from 'vs/base/common/errors'; -import { IClientSession, IKernelPreference, IClientSessionOptions } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { IClientSession, IKernelPreference, IClientSessionOptions } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { Deferred } from 'sql/base/common/promise'; import { INotebookManager } from 'sql/workbench/services/notebook/browser/notebookService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/notebook/browser/models/mimemodel.ts b/src/sql/workbench/contrib/notebook/browser/models/mimemodel.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/models/mimemodel.ts rename to src/sql/workbench/contrib/notebook/browser/models/mimemodel.ts diff --git a/src/sql/workbench/parts/notebook/browser/models/modelFactory.ts b/src/sql/workbench/contrib/notebook/browser/models/modelFactory.ts similarity index 77% rename from src/sql/workbench/parts/notebook/browser/models/modelFactory.ts rename to src/sql/workbench/contrib/notebook/browser/models/modelFactory.ts index bce65c15d1..7183f91a19 100644 --- a/src/sql/workbench/parts/notebook/browser/models/modelFactory.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/modelFactory.ts @@ -5,9 +5,9 @@ import { nb } from 'azdata'; -import { CellModel } from 'sql/workbench/parts/notebook/browser/models/cell'; -import { IClientSession, IClientSessionOptions, ICellModelOptions, ICellModel, IModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { ClientSession } from 'sql/workbench/parts/notebook/browser/models/clientSession'; +import { CellModel } from 'sql/workbench/contrib/notebook/browser/models/cell'; +import { IClientSession, IClientSessionOptions, ICellModelOptions, ICellModel, IModelFactory } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { ClientSession } from 'sql/workbench/contrib/notebook/browser/models/clientSession'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; export class ModelFactory implements IModelFactory { diff --git a/src/sql/workbench/parts/notebook/browser/models/modelInterfaces.ts b/src/sql/workbench/contrib/notebook/browser/models/modelInterfaces.ts similarity index 97% rename from src/sql/workbench/parts/notebook/browser/models/modelInterfaces.ts rename to src/sql/workbench/contrib/notebook/browser/models/modelInterfaces.ts index e50264694a..eb8f6fb551 100644 --- a/src/sql/workbench/parts/notebook/browser/models/modelInterfaces.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/modelInterfaces.ts @@ -11,16 +11,16 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { URI } from 'vs/base/common/uri'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { CellType, NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { INotebookManager, ILanguageMagic } from 'sql/workbench/services/notebook/browser/notebookService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { IStandardKernelWithProvider } from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { localize } from 'vs/nls'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents'; diff --git a/src/sql/workbench/parts/notebook/browser/models/notebookContexts.ts b/src/sql/workbench/contrib/notebook/browser/models/notebookContexts.ts similarity index 99% rename from src/sql/workbench/parts/notebook/browser/models/notebookContexts.ts rename to src/sql/workbench/contrib/notebook/browser/models/notebookContexts.ts index a68b7152f4..f2c0f21d5d 100644 --- a/src/sql/workbench/parts/notebook/browser/models/notebookContexts.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/notebookContexts.ts @@ -6,7 +6,7 @@ import { nb } from 'azdata'; import { localize } from 'vs/nls'; -import { IDefaultConnection, notebookConstants } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { IDefaultConnection, notebookConstants } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/notebook/browser/models/notebookInput.ts b/src/sql/workbench/contrib/notebook/browser/models/notebookInput.ts similarity index 97% rename from src/sql/workbench/parts/notebook/browser/models/notebookInput.ts rename to src/sql/workbench/contrib/notebook/browser/models/notebookInput.ts index c1b12a75f4..62844ab158 100644 --- a/src/sql/workbench/parts/notebook/browser/models/notebookInput.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/notebookInput.ts @@ -10,11 +10,11 @@ import { URI } from 'vs/base/common/uri'; import * as resources from 'vs/base/common/resources'; import * as azdata from 'azdata'; -import { IStandardKernelWithProvider, getProvidersForFileName, getStandardKernelsForProvider } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { IStandardKernelWithProvider, getProvidersForFileName, getStandardKernelsForProvider } from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import { INotebookService, DEFAULT_NOTEBOOK_PROVIDER, IProviderInfo } from 'sql/workbench/services/notebook/browser/notebookService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; -import { INotebookModel, IContentManager, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { INotebookModel, IContentManager, NotebookContentChange } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel'; import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel'; import { Schemas } from 'vs/base/common/network'; @@ -24,9 +24,9 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { IDisposable } from 'vs/base/common/lifecycle'; -import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { Deferred } from 'sql/base/common/promise'; -import { NotebookTextFileModel } from 'sql/workbench/parts/notebook/browser/models/notebookTextFileModel'; +import { NotebookTextFileModel } from 'sql/workbench/contrib/notebook/browser/models/notebookTextFileModel'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; import { ResourceEditorModel } from 'vs/workbench/common/editor/resourceEditorModel'; diff --git a/src/sql/workbench/parts/notebook/browser/models/notebookModel.ts b/src/sql/workbench/contrib/notebook/browser/models/notebookModel.ts similarity index 98% rename from src/sql/workbench/parts/notebook/browser/models/notebookModel.ts rename to src/sql/workbench/contrib/notebook/browser/models/notebookModel.ts index cd0248e778..fead69ac59 100644 --- a/src/sql/workbench/parts/notebook/browser/models/notebookModel.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/notebookModel.ts @@ -9,13 +9,13 @@ import { localize } from 'vs/nls'; import { Event, Emitter } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, NotebookContentChange, notebookConstants } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookChangeType, CellType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { nbversion } from 'sql/workbench/parts/notebook/common/models/notebookConstants'; -import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, NotebookContentChange, notebookConstants } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookChangeType, CellType, CellTypes } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { nbversion } from 'sql/workbench/contrib/notebook/common/models/notebookConstants'; +import * as notebookUtils from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/browser/notebookService'; -import { NotebookContexts } from 'sql/workbench/parts/notebook/browser/models/notebookContexts'; +import { NotebookContexts } from 'sql/workbench/contrib/notebook/browser/models/notebookContexts'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { INotification, Severity, INotificationService } from 'vs/platform/notification/common/notification'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/workbench/parts/notebook/browser/models/notebookTextFileModel.ts b/src/sql/workbench/contrib/notebook/browser/models/notebookTextFileModel.ts similarity index 98% rename from src/sql/workbench/parts/notebook/browser/models/notebookTextFileModel.ts rename to src/sql/workbench/contrib/notebook/browser/models/notebookTextFileModel.ts index e5d4b449bb..59cec0fb06 100644 --- a/src/sql/workbench/parts/notebook/browser/models/notebookTextFileModel.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/notebookTextFileModel.ts @@ -5,8 +5,8 @@ import { Range, IRange } from 'vs/editor/common/core/range'; import { FindMatch } from 'vs/editor/common/model'; -import { NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { NotebookContentChange, INotebookModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel'; import { repeat } from 'vs/base/common/strings'; diff --git a/src/sql/workbench/parts/notebook/browser/models/notebookUtils.ts b/src/sql/workbench/contrib/notebook/browser/models/notebookUtils.ts similarity index 98% rename from src/sql/workbench/parts/notebook/browser/models/notebookUtils.ts rename to src/sql/workbench/contrib/notebook/browser/models/notebookUtils.ts index 18b16a7bee..e3ad554d7f 100644 --- a/src/sql/workbench/parts/notebook/browser/models/notebookUtils.ts +++ b/src/sql/workbench/contrib/notebook/browser/models/notebookUtils.ts @@ -8,7 +8,7 @@ import { nb, ServerInfo } from 'azdata'; import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { URI } from 'vs/base/common/uri'; import { startsWith } from 'vs/base/common/strings'; import { assign } from 'vs/base/common/objects'; diff --git a/src/sql/workbench/parts/notebook/browser/models/outputProcessor.ts b/src/sql/workbench/contrib/notebook/browser/models/outputProcessor.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/models/outputProcessor.ts rename to src/sql/workbench/contrib/notebook/browser/models/outputProcessor.ts diff --git a/src/sql/workbench/parts/notebook/browser/models/renderMimeInterfaces.ts b/src/sql/workbench/contrib/notebook/browser/models/renderMimeInterfaces.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/models/renderMimeInterfaces.ts rename to src/sql/workbench/contrib/notebook/browser/models/renderMimeInterfaces.ts diff --git a/src/sql/workbench/parts/notebook/browser/notebook.component.html b/src/sql/workbench/contrib/notebook/browser/notebook.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/notebook.component.html rename to src/sql/workbench/contrib/notebook/browser/notebook.component.html diff --git a/src/sql/workbench/parts/notebook/browser/notebook.component.ts b/src/sql/workbench/contrib/notebook/browser/notebook.component.ts similarity index 97% rename from src/sql/workbench/parts/notebook/browser/notebook.component.ts rename to src/sql/workbench/contrib/notebook/browser/notebook.component.ts index 01331c19f7..ea55459e7b 100644 --- a/src/sql/workbench/parts/notebook/browser/notebook.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebook.component.ts @@ -22,25 +22,25 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import * as DOM from 'vs/base/browser/dom'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { CellTypes, CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { ICellModel, IModelFactory, INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { CellTypes, CellType } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { ICellModel, IModelFactory, INotebookModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER, INotebookSection, INavigationProvider } from 'sql/workbench/services/notebook/browser/notebookService'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; -import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; -import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; +import { ModelFactory } from 'sql/workbench/contrib/notebook/browser/models/modelFactory'; +import * as notebookUtils from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import { Deferred } from 'sql/base/common/promise'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, RunAllCellsAction, ClearAllOutputsAction, CollapseCellsAction } from 'sql/workbench/parts/notebook/browser/notebookActions'; +import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, RunAllCellsAction, ClearAllOutputsAction, CollapseCellsAction } from 'sql/workbench/contrib/notebook/browser/notebookActions'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { CellMagicMapper } from 'sql/workbench/parts/notebook/browser/models/cellMagicMapper'; +import { CellMagicMapper } from 'sql/workbench/contrib/notebook/browser/models/cellMagicMapper'; import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions'; -import { CellModel } from 'sql/workbench/parts/notebook/browser/models/cell'; +import { CellModel } from 'sql/workbench/contrib/notebook/browser/models/cell'; import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files'; import { isValidBasename } from 'vs/base/common/extpath'; import { basename } from 'vs/base/common/resources'; diff --git a/src/sql/workbench/parts/notebook/browser/notebook.contribution.ts b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts similarity index 87% rename from src/sql/workbench/parts/notebook/browser/notebook.contribution.ts rename to src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts index d38d1bfddc..3251fcd3ba 100644 --- a/src/sql/workbench/parts/notebook/browser/notebook.contribution.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebook.contribution.ts @@ -8,36 +8,36 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions'; import { SyncActionDescriptor, registerAction, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; -import { NotebookEditor } from 'sql/workbench/parts/notebook/browser/notebookEditor'; -import { NewNotebookAction } from 'sql/workbench/parts/notebook/browser/notebookActions'; +import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; +import { NotebookEditor } from 'sql/workbench/contrib/notebook/browser/notebookEditor'; +import { NewNotebookAction } from 'sql/workbench/contrib/notebook/browser/notebookActions'; import { KeyMod } from 'vs/editor/common/standalone/standaloneBase'; import { KeyCode } from 'vs/base/common/keyCodes'; import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { localize } from 'vs/nls'; -import { GridOutputComponent } from 'sql/workbench/parts/notebook/browser/outputs/gridOutput.component'; -import { PlotlyOutputComponent } from 'sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component'; -import { registerComponentType } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; -import { MimeRendererComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component'; +import { GridOutputComponent } from 'sql/workbench/contrib/notebook/browser/outputs/gridOutput.component'; +import { PlotlyOutputComponent } from 'sql/workbench/contrib/notebook/browser/outputs/plotlyOutput.component'; +import { registerComponentType } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; +import { MimeRendererComponent } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { URI } from 'vs/base/common/uri'; import { IWorkspaceEditingService } from 'vs/workbench/services/workspaces/common/workspaceEditing'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; +import { NodeContextKey } from 'sql/workbench/contrib/dataExplorer/browser/nodeContext'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { ConnectedContext } from 'azdata'; -import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; +import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; -import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; +import { ObjectExplorerActionsContext } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; +import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext'; import { ManageActionContext } from 'sql/workbench/browser/actions'; import { IHostService } from 'vs/workbench/services/host/browser/host'; -import { MarkdownOutputComponent } from 'sql/workbench/parts/notebook/browser/outputs/markdownOutput.component'; +import { MarkdownOutputComponent } from 'sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component'; import { registerCellComponent } from 'sql/platform/notebooks/common/outputRegistry'; -import { TextCellComponent } from 'sql/workbench/parts/notebook/browser/cellViews/textCell.component'; +import { TextCellComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/textCell.component'; // Model View editor registration const viewModelEditorDescriptor = new EditorDescriptor( diff --git a/src/sql/workbench/parts/notebook/browser/notebook.css b/src/sql/workbench/contrib/notebook/browser/notebook.css similarity index 100% rename from src/sql/workbench/parts/notebook/browser/notebook.css rename to src/sql/workbench/contrib/notebook/browser/notebook.css diff --git a/src/sql/workbench/parts/notebook/browser/notebook.module.ts b/src/sql/workbench/contrib/notebook/browser/notebook.module.ts similarity index 74% rename from src/sql/workbench/parts/notebook/browser/notebook.module.ts rename to src/sql/workbench/contrib/notebook/browser/notebook.module.ts index f63b76c937..1195518ee8 100644 --- a/src/sql/workbench/parts/notebook/browser/notebook.module.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebook.module.ts @@ -8,28 +8,28 @@ import { FormsModule } from '@angular/forms'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component'; -import { NotebookComponent } from 'sql/workbench/parts/notebook/browser/notebook.component'; +import { NotebookComponent } from 'sql/workbench/contrib/notebook/browser/notebook.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { CodeComponent } from 'sql/workbench/parts/notebook/browser/cellViews/code.component'; -import { CodeCellComponent } from 'sql/workbench/parts/notebook/browser/cellViews/codeCell.component'; -import { OutputAreaComponent } from 'sql/workbench/parts/notebook/browser/cellViews/outputArea.component'; -import { OutputComponent } from 'sql/workbench/parts/notebook/browser/cellViews/output.component'; -import { StdInComponent } from 'sql/workbench/parts/notebook/browser/cellViews/stdin.component'; -import { PlaceholderCellComponent } from 'sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component'; +import { CodeComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/code.component'; +import { CodeCellComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/codeCell.component'; +import { OutputAreaComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/outputArea.component'; +import { OutputComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/output.component'; +import { StdInComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/stdin.component'; +import { PlaceholderCellComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/placeholderCell.component'; import LoadingSpinner from 'sql/workbench/browser/modelComponents/loadingSpinner.component'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; -import { IMimeComponentRegistry, Extensions } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; +import { IMimeComponentRegistry, Extensions } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; -import { LinkHandlerDirective } from 'sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive'; +import { LinkHandlerDirective } from 'sql/workbench/contrib/notebook/browser/cellViews/linkHandler.directive'; import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; import { ICellComponenetRegistry, Extensions as OutputComponentExtensions } from 'sql/platform/notebooks/common/outputRegistry'; -import { CollapseComponent } from 'sql/workbench/parts/notebook/browser/cellViews/collapse.component'; +import { CollapseComponent } from 'sql/workbench/contrib/notebook/browser/cellViews/collapse.component'; const outputComponentRegistry = Registry.as(OutputComponentExtensions.CellComponentContributions); diff --git a/src/sql/workbench/parts/notebook/browser/notebookActions.ts b/src/sql/workbench/contrib/notebook/browser/notebookActions.ts similarity index 97% rename from src/sql/workbench/parts/notebook/browser/notebookActions.ts rename to src/sql/workbench/contrib/notebook/browser/notebookActions.ts index dbb14515e4..1cf876f5d9 100644 --- a/src/sql/workbench/parts/notebook/browser/notebookActions.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebookActions.ts @@ -16,17 +16,17 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { noKernel } from 'sql/workbench/services/notebook/browser/sessionManager'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; import { generateUri } from 'sql/platform/connection/common/utils'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ILogService } from 'vs/platform/log/common/log'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { NotebookComponent } from 'sql/workbench/parts/notebook/browser/notebook.component'; +import { CellType } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { NotebookComponent } from 'sql/workbench/contrib/notebook/browser/notebook.component'; import { getErrorMessage } from 'vs/base/common/errors'; -import { INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { INotebookModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import { find, firstIndex } from 'vs/base/common/arrays'; const msgLoading = localize('loading', "Loading kernels..."); diff --git a/src/sql/workbench/parts/notebook/browser/notebookEditor.ts b/src/sql/workbench/contrib/notebook/browser/notebookEditor.ts similarity index 92% rename from src/sql/workbench/parts/notebook/browser/notebookEditor.ts rename to src/sql/workbench/contrib/notebook/browser/notebookEditor.ts index 624e5cb926..d771d0a862 100644 --- a/src/sql/workbench/parts/notebook/browser/notebookEditor.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebookEditor.ts @@ -11,9 +11,9 @@ import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/boots import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; -import { NotebookModule } from 'sql/workbench/parts/notebook/browser/notebook.module'; -import { NOTEBOOK_SELECTOR } from 'sql/workbench/parts/notebook/browser/notebook.component'; +import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; +import { NotebookModule } from 'sql/workbench/contrib/notebook/browser/notebook.module'; +import { NOTEBOOK_SELECTOR } from 'sql/workbench/contrib/notebook/browser/notebook.component'; import { INotebookParams } from 'sql/workbench/services/notebook/browser/notebookService'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/workbench/parts/notebook/browser/notebookStyles.ts b/src/sql/workbench/contrib/notebook/browser/notebookStyles.ts similarity index 99% rename from src/sql/workbench/parts/notebook/browser/notebookStyles.ts rename to src/sql/workbench/contrib/notebook/browser/notebookStyles.ts index a9696aa142..ae305e27d3 100644 --- a/src/sql/workbench/parts/notebook/browser/notebookStyles.ts +++ b/src/sql/workbench/contrib/notebook/browser/notebookStyles.ts @@ -10,7 +10,7 @@ import { activeContrastBorder, contrastBorder, buttonBackground, textLinkForegro import { editorLineHighlight, editorLineHighlightBorder } from 'vs/editor/common/view/editorColorRegistry'; import { IDisposable } from 'vs/base/common/lifecycle'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { BareResultsGridInfo, getBareResultsGridInfoStyles } from 'sql/workbench/parts/query/browser/queryResultsEditor'; +import { BareResultsGridInfo, getBareResultsGridInfoStyles } from 'sql/workbench/contrib/query/browser/queryResultsEditor'; import { getZoomLevel } from 'vs/base/browser/browser'; import * as types from 'vs/base/common/types'; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/factories.ts b/src/sql/workbench/contrib/notebook/browser/outputs/factories.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/outputs/factories.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/factories.ts diff --git a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts b/src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts similarity index 95% rename from src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts index c0581ab4ac..a26545cdab 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts @@ -12,7 +12,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; +import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import { IDataResource } from 'sql/workbench/services/notebook/browser/sql/sqlSessionManager'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/platform/query/common/queryRunner'; @@ -23,15 +23,15 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { localize } from 'vs/nls'; import { IAction } from 'vs/base/common/actions'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; -import { GridTableState } from 'sql/workbench/parts/query/common/gridPanelState'; -import { GridTableBase } from 'sql/workbench/parts/query/browser/gridPanel'; +import { IMimeComponent } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { MimeModel } from 'sql/workbench/contrib/notebook/browser/models/mimemodel'; +import { GridTableState } from 'sql/workbench/contrib/query/common/gridPanelState'; +import { GridTableBase } from 'sql/workbench/contrib/query/browser/gridPanel'; import { getErrorMessage } from 'vs/base/common/errors'; import { ISerializationService, SerializeDataParams } from 'sql/platform/serialization/common/serializationService'; -import { SaveResultAction } from 'sql/workbench/parts/query/browser/actions'; -import { ResultSerializer, SaveResultsResponse } from 'sql/workbench/parts/query/common/resultSerializer'; +import { SaveResultAction } from 'sql/workbench/contrib/query/browser/actions'; +import { ResultSerializer, SaveResultsResponse } from 'sql/workbench/contrib/query/common/resultSerializer'; import { ActionsOrientation } from 'vs/base/browser/ui/actionbar/actionbar'; import { values } from 'vs/base/common/collections'; import { assign } from 'vs/base/common/objects'; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/markdownOutput.component.html b/src/sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component.html similarity index 100% rename from src/sql/workbench/parts/notebook/browser/outputs/markdownOutput.component.html rename to src/sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component.html diff --git a/src/sql/workbench/parts/notebook/browser/outputs/markdownOutput.component.ts b/src/sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component.ts similarity index 90% rename from src/sql/workbench/parts/notebook/browser/outputs/markdownOutput.component.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component.ts index ec1d6944b3..82b4bd519f 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/markdownOutput.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/markdownOutput.component.ts @@ -9,16 +9,16 @@ import 'vs/css!../cellViews/media/highlight'; import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild } from '@angular/core'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { ISanitizer, defaultSanitizer } from 'sql/workbench/parts/notebook/browser/outputs/sanitizer'; +import { ISanitizer, defaultSanitizer } from 'sql/workbench/contrib/notebook/browser/outputs/sanitizer'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; +import { IMimeComponent } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { NotebookMarkdownRenderer } from 'sql/workbench/parts/notebook/browser/outputs/notebookMarkdown'; -import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { NotebookMarkdownRenderer } from 'sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown'; +import { MimeModel } from 'sql/workbench/contrib/notebook/browser/models/mimemodel'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import { URI } from 'vs/base/common/uri'; @Component({ diff --git a/src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts b/src/sql/workbench/contrib/notebook/browser/outputs/mimeRegistry.ts similarity index 95% rename from src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/mimeRegistry.ts index ea4d255ce1..501bb4db37 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/mimeRegistry.ts @@ -5,10 +5,10 @@ import { Type } from '@angular/core'; import * as platform from 'vs/platform/registry/common/platform'; -import { ReadonlyJSONObject } from 'sql/workbench/parts/notebook/common/models/jsonext'; -import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; +import { ReadonlyJSONObject } from 'sql/workbench/contrib/notebook/common/models/jsonext'; +import { MimeModel } from 'sql/workbench/contrib/notebook/browser/models/mimemodel'; import * as types from 'vs/base/common/types'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { values } from 'vs/base/common/collections'; export type FactoryIdentifier = string; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts b/src/sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component.ts similarity index 90% rename from src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component.ts index 6997fdfe81..d6fa96d383 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/mimeRenderer.component.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; +import { IMimeComponent } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { ElementRef, forwardRef, Inject, Component, OnInit, Input } from '@angular/core'; -import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; +import { MimeModel } from 'sql/workbench/contrib/notebook/browser/models/mimemodel'; import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; -import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry'; +import { RenderMimeRegistry } from 'sql/workbench/contrib/notebook/browser/outputs/registry'; import { localize } from 'vs/nls'; @Component({ diff --git a/src/sql/workbench/parts/notebook/browser/outputs/notebookMarkdown.ts b/src/sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/outputs/notebookMarkdown.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown.ts diff --git a/src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts b/src/sql/workbench/contrib/notebook/browser/outputs/plotlyOutput.component.ts similarity index 93% rename from src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/plotlyOutput.component.ts index c7cb32d1b5..fbed0c63c2 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/plotlyOutput.component.ts @@ -8,9 +8,9 @@ import { OnInit, Component, Input, ElementRef, ViewChild } from '@angular/core'; import { localize } from 'vs/nls'; import * as types from 'vs/base/common/types'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; +import { IMimeComponent } from 'sql/workbench/contrib/notebook/browser/outputs/mimeRegistry'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { MimeModel } from 'sql/workbench/contrib/notebook/browser/models/mimemodel'; import { getErrorMessage } from 'vs/base/common/errors'; type ObjectType = object; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/registry.ts b/src/sql/workbench/contrib/notebook/browser/outputs/registry.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/outputs/registry.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/registry.ts diff --git a/src/sql/workbench/parts/notebook/browser/outputs/renderers.ts b/src/sql/workbench/contrib/notebook/browser/outputs/renderers.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/outputs/renderers.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/renderers.ts diff --git a/src/sql/workbench/parts/notebook/browser/outputs/sanitizer.ts b/src/sql/workbench/contrib/notebook/browser/outputs/sanitizer.ts similarity index 100% rename from src/sql/workbench/parts/notebook/browser/outputs/sanitizer.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/sanitizer.ts diff --git a/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts b/src/sql/workbench/contrib/notebook/browser/outputs/tableRenderers.ts similarity index 98% rename from src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/tableRenderers.ts index bde3dd0edd..b85b8d6723 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/tableRenderers.ts @@ -14,7 +14,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin'; import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin'; -import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/parts/query/common/resultsGridContribution'; +import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/contrib/query/common/resultsGridContribution'; import { values } from 'vs/base/common/collections'; /** diff --git a/src/sql/workbench/parts/notebook/browser/outputs/widgets.ts b/src/sql/workbench/contrib/notebook/browser/outputs/widgets.ts similarity index 99% rename from src/sql/workbench/parts/notebook/browser/outputs/widgets.ts rename to src/sql/workbench/contrib/notebook/browser/outputs/widgets.ts index 08ab9f68fc..5df280a738 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/widgets.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/widgets.ts @@ -6,7 +6,7 @@ import * as renderers from './renderers'; import { IRenderMime } from '../models/renderMimeInterfaces'; import { ReadonlyJSONObject } from '../../common/models/jsonext'; -import * as tableRenderers from 'sql/workbench/parts/notebook/browser/outputs/tableRenderers'; +import * as tableRenderers from 'sql/workbench/contrib/notebook/browser/outputs/tableRenderers'; import { Deferred } from 'sql/base/common/promise'; /** diff --git a/src/sql/workbench/parts/notebook/common/models/contracts.ts b/src/sql/workbench/contrib/notebook/common/models/contracts.ts similarity index 100% rename from src/sql/workbench/parts/notebook/common/models/contracts.ts rename to src/sql/workbench/contrib/notebook/common/models/contracts.ts diff --git a/src/sql/workbench/parts/notebook/common/models/jsonext.ts b/src/sql/workbench/contrib/notebook/common/models/jsonext.ts similarity index 100% rename from src/sql/workbench/parts/notebook/common/models/jsonext.ts rename to src/sql/workbench/contrib/notebook/common/models/jsonext.ts diff --git a/src/sql/workbench/parts/notebook/common/models/nbformat.ts b/src/sql/workbench/contrib/notebook/common/models/nbformat.ts similarity index 100% rename from src/sql/workbench/parts/notebook/common/models/nbformat.ts rename to src/sql/workbench/contrib/notebook/common/models/nbformat.ts diff --git a/src/sql/workbench/parts/notebook/common/models/notebookConnection.ts b/src/sql/workbench/contrib/notebook/common/models/notebookConnection.ts similarity index 100% rename from src/sql/workbench/parts/notebook/common/models/notebookConnection.ts rename to src/sql/workbench/contrib/notebook/common/models/notebookConnection.ts diff --git a/src/sql/workbench/parts/notebook/common/models/notebookConstants.ts b/src/sql/workbench/contrib/notebook/common/models/notebookConstants.ts similarity index 100% rename from src/sql/workbench/parts/notebook/common/models/notebookConstants.ts rename to src/sql/workbench/contrib/notebook/common/models/notebookConstants.ts diff --git a/src/sql/workbench/parts/notebook/common/models/url.ts b/src/sql/workbench/contrib/notebook/common/models/url.ts similarity index 100% rename from src/sql/workbench/parts/notebook/common/models/url.ts rename to src/sql/workbench/contrib/notebook/common/models/url.ts diff --git a/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts b/src/sql/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts rename to src/sql/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts index 14dcd31e93..caaa043c37 100644 --- a/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts +++ b/src/sql/workbench/contrib/notebook/test/browser/notebookEditorModel.test.ts @@ -9,12 +9,12 @@ import * as assert from 'assert'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; -import { CellModel } from 'sql/workbench/parts/notebook/browser/models/cell'; -import { CellTypes, NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; -import { INotebookModelOptions, NotebookContentChange, ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookEditorModel } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { CellModel } from 'sql/workbench/contrib/notebook/browser/models/cell'; +import { CellTypes, NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { ModelFactory } from 'sql/workbench/contrib/notebook/browser/models/modelFactory'; +import { INotebookModelOptions, NotebookContentChange, ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookEditorModel } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; import { NotebookService } from 'sql/workbench/services/notebook/browser/notebookServiceImpl'; import { URI } from 'vs/base/common/uri'; import { toResource } from 'vs/base/test/common/utils'; diff --git a/src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/cell.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts rename to src/sql/workbench/contrib/notebook/test/electron-browser/cell.test.ts index 6e2e32cb98..f4197b1805 100644 --- a/src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/cell.test.ts @@ -9,11 +9,11 @@ import * as assert from 'assert'; import * as objects from 'vs/base/common/objects'; -import { CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; +import { CellTypes } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { ModelFactory } from 'sql/workbench/contrib/notebook/browser/models/modelFactory'; import { NotebookModelStub } from './common'; import { EmptyFuture } from 'sql/workbench/services/notebook/browser/sessionManager'; -import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { Deferred } from 'sql/base/common/promise'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/parts/notebook/test/electron-browser/clientSession.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/clientSession.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/electron-browser/clientSession.test.ts rename to src/sql/workbench/contrib/notebook/test/electron-browser/clientSession.test.ts index 4e456c606c..280b2ef40d 100644 --- a/src/sql/workbench/parts/notebook/test/electron-browser/clientSession.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/clientSession.test.ts @@ -11,7 +11,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import { URI } from 'vs/base/common/uri'; -import { ClientSession } from 'sql/workbench/parts/notebook/browser/models/clientSession'; +import { ClientSession } from 'sql/workbench/contrib/notebook/browser/models/clientSession'; import { SessionManager } from 'sql/workbench/services/notebook/browser/sessionManager'; import { NotebookManagerStub, ServerManagerStub } from './common'; import { isUndefinedOrNull } from 'vs/base/common/types'; diff --git a/src/sql/workbench/parts/notebook/test/electron-browser/common.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/common.ts similarity index 93% rename from src/sql/workbench/parts/notebook/test/electron-browser/common.ts rename to src/sql/workbench/contrib/notebook/test/electron-browser/common.ts index 06266d44c8..eb2bea3520 100644 --- a/src/sql/workbench/parts/notebook/test/electron-browser/common.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/common.ts @@ -6,11 +6,11 @@ import { nb, IConnectionProfile } from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; -import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookChangeType, CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookChangeType, CellType } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { INotebookManager } from 'sql/workbench/services/notebook/browser/notebookService'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { IStandardKernelWithProvider } from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; export class NotebookModelStub implements INotebookModel { constructor(private _languageInfo?: nb.ILanguageInfo) { diff --git a/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/contentManagers.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts rename to src/sql/workbench/contrib/notebook/test/electron-browser/contentManagers.test.ts index e54299c271..e0011e8d85 100644 --- a/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/contentManagers.test.ts @@ -10,7 +10,7 @@ import { URI } from 'vs/base/common/uri'; import * as tempWrite from 'temp-write'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; import * as testUtils from '../../../../../base/test/common/async'; -import { CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { CellTypes } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { TestFileService } from 'vs/workbench/test/workbenchTestServices'; import { IFileService, IReadFileOptions, IFileContent, IWriteFileOptions, IFileStatWithMetadata } from 'vs/platform/files/common/files'; diff --git a/src/sql/workbench/parts/notebook/test/electron-browser/notebookModel.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts similarity index 96% rename from src/sql/workbench/parts/notebook/test/electron-browser/notebookModel.test.ts rename to src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts index 54f9af3b83..dedca90579 100644 --- a/src/sql/workbench/parts/notebook/test/electron-browser/notebookModel.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookModel.test.ts @@ -13,11 +13,11 @@ import { URI } from 'vs/base/common/uri'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; import { NotebookManagerStub } from './common'; -import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; -import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; -import { IClientSession, INotebookModelOptions, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { ClientSession } from 'sql/workbench/parts/notebook/browser/models/clientSession'; -import { CellTypes, NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { NotebookModel } from 'sql/workbench/contrib/notebook/browser/models/notebookModel'; +import { ModelFactory } from 'sql/workbench/contrib/notebook/browser/models/modelFactory'; +import { IClientSession, INotebookModelOptions, NotebookContentChange } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { ClientSession } from 'sql/workbench/contrib/notebook/browser/models/clientSession'; +import { CellTypes, NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { Deferred } from 'sql/base/common/promise'; import { Memento } from 'vs/workbench/common/memento'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/notebook/test/electron-browser/notebookUtils.test.ts b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/electron-browser/notebookUtils.test.ts rename to src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts index fb478fdf1e..a583a42d26 100644 --- a/src/sql/workbench/parts/notebook/test/electron-browser/notebookUtils.test.ts +++ b/src/sql/workbench/contrib/notebook/test/electron-browser/notebookUtils.test.ts @@ -8,7 +8,7 @@ import * as assert from 'assert'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { formatServerNameWithDatabaseNameForAttachTo, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { formatServerNameWithDatabaseNameForAttachTo, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; suite('notebookUtils', function (): void { diff --git a/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts b/src/sql/workbench/contrib/objectExplorer/browser/connectionTreeAction.ts similarity index 97% rename from src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts rename to src/sql/workbench/contrib/objectExplorer/browser/connectionTreeAction.ts index 8e49df5c9c..c3d0e5a521 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/connectionTreeAction.ts @@ -7,14 +7,14 @@ import { localize } from 'vs/nls'; import { Action } from 'vs/base/common/actions'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeView'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import Severity from 'vs/base/common/severity'; -import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; +import { ObjectExplorerActionsContext } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { UNSAVED_GROUP_ID } from 'sql/platform/connection/common/constants'; import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/dragAndDropController.ts b/src/sql/workbench/contrib/objectExplorer/browser/dragAndDropController.ts similarity index 98% rename from src/sql/workbench/parts/objectExplorer/browser/dragAndDropController.ts rename to src/sql/workbench/contrib/objectExplorer/browser/dragAndDropController.ts index c8852fbad6..b1f34efd51 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/dragAndDropController.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/dragAndDropController.ts @@ -8,7 +8,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf 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 { DragMouseEvent } from 'vs/base/browser/mouseEvent'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import { UNSAVED_GROUP_ID } from 'sql/platform/connection/common/constants'; import { IDragAndDropData } from 'vs/base/browser/dnd'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/iconRenderer.ts b/src/sql/workbench/contrib/objectExplorer/browser/iconRenderer.ts similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/iconRenderer.ts rename to src/sql/workbench/contrib/objectExplorer/browser/iconRenderer.ts diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/add_server.svg b/src/sql/workbench/contrib/objectExplorer/browser/media/add_server.svg similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/add_server.svg rename to src/sql/workbench/contrib/objectExplorer/browser/media/add_server.svg diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/add_server_inverse.svg b/src/sql/workbench/contrib/objectExplorer/browser/media/add_server_inverse.svg similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/add_server_inverse.svg rename to src/sql/workbench/contrib/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/contrib/objectExplorer/browser/media/connected_active_server.svg similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server.svg rename to src/sql/workbench/contrib/objectExplorer/browser/media/connected_active_server.svg diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server_inverse.svg b/src/sql/workbench/contrib/objectExplorer/browser/media/connected_active_server_inverse.svg similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/connected_active_server_inverse.svg rename to src/sql/workbench/contrib/objectExplorer/browser/media/connected_active_server_inverse.svg diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup.svg b/src/sql/workbench/contrib/objectExplorer/browser/media/new_servergroup.svg similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup.svg rename to src/sql/workbench/contrib/objectExplorer/browser/media/new_servergroup.svg diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup_inverse.svg b/src/sql/workbench/contrib/objectExplorer/browser/media/new_servergroup_inverse.svg similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/new_servergroup_inverse.svg rename to src/sql/workbench/contrib/objectExplorer/browser/media/new_servergroup_inverse.svg diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/serverGroupDialog.css b/src/sql/workbench/contrib/objectExplorer/browser/media/serverGroupDialog.css similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/serverGroupDialog.css rename to src/sql/workbench/contrib/objectExplorer/browser/media/serverGroupDialog.css diff --git a/src/sql/workbench/parts/objectExplorer/browser/media/serverTreeActions.css b/src/sql/workbench/contrib/objectExplorer/browser/media/serverTreeActions.css similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/media/serverTreeActions.css rename to src/sql/workbench/contrib/objectExplorer/browser/media/serverTreeActions.css diff --git a/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts b/src/sql/workbench/contrib/objectExplorer/browser/objectExplorerActions.ts similarity index 90% rename from src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts rename to src/sql/workbench/contrib/objectExplorer/browser/objectExplorerActions.ts index aabe49bdfd..ffea99209f 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/objectExplorerActions.ts @@ -7,9 +7,9 @@ import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; import { ICommandService } from 'vs/platform/commands/common/commands'; import * as azdata from 'azdata'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; -import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; +import { TreeSelectionHandler } from 'sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim.ts b/src/sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim.ts similarity index 98% rename from src/sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim.ts rename to src/sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim.ts index 69ea3c4948..7071687c54 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; @@ -16,7 +16,7 @@ import { generateUuid } from 'vs/base/common/uuid'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { TreeItemCollapsibleState } from 'vs/workbench/common/views'; import { localize } from 'vs/nls'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { UserCancelledConnectionError } from 'sql/base/common/errors'; import { assign } from 'vs/base/common/objects'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource.ts b/src/sql/workbench/contrib/objectExplorer/browser/recentConnectionDataSource.ts similarity index 100% rename from src/sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource.ts rename to src/sql/workbench/contrib/objectExplorer/browser/recentConnectionDataSource.ts diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverGroupDialog.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts similarity index 99% rename from src/sql/workbench/parts/objectExplorer/browser/serverGroupDialog.ts rename to src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts index 59b12e63fd..81093d1ff7 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverGroupDialog.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts @@ -20,7 +20,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; 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/workbench/parts/objectExplorer/common/serverGroupViewModel'; +import { ServerGroupViewModel } from 'sql/workbench/contrib/objectExplorer/common/serverGroupViewModel'; import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts similarity index 92% rename from src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts rename to src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts index 058fc2595e..b2258f5111 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts @@ -12,18 +12,18 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { DisconnectConnectionAction, AddServerAction, DeleteConnectionAction, RefreshAction, EditServerGroupAction -} from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +} from 'sql/workbench/contrib/objectExplorer/browser/connectionTreeAction'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { MenuId, IMenuService } from 'vs/platform/actions/common/actions'; -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; -import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; +import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey'; +import { ServerInfoContextKey } from 'sql/workbench/contrib/connection/common/serverInfoContextKey'; import { fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewItem'; import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; import { firstIndex, find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverTreeController.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeController.ts similarity index 92% rename from src/sql/workbench/parts/objectExplorer/browser/serverTreeController.ts rename to src/sql/workbench/contrib/objectExplorer/browser/serverTreeController.ts index 525c1a09c4..698f015137 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeController.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeController.ts @@ -10,9 +10,9 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -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'; +import { ServerTreeActionProvider } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider'; +import { ObjectExplorerActionsContext } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; /** * Extends the tree controller to handle clicks on the tree elements diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeDataSource.ts similarity index 96% rename from src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts rename to src/sql/workbench/contrib/objectExplorer/browser/serverTreeDataSource.ts index 75f8442b5f..0c25a240f5 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeDataSource.ts @@ -6,9 +6,9 @@ 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/workbench/parts/objectExplorer/common/treeNode'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/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/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeRenderer.ts similarity index 98% rename from src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts rename to src/sql/workbench/contrib/objectExplorer/browser/serverTreeRenderer.ts index 16cca6b3f5..06faed4b13 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeRenderer.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeRenderer.ts @@ -12,9 +12,9 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectio import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; -import { badgeRenderer, iconRenderer } from 'sql/workbench/parts/objectExplorer/browser/iconRenderer'; +import { badgeRenderer, iconRenderer } from 'sql/workbench/contrib/objectExplorer/browser/iconRenderer'; import { URI } from 'vs/base/common/uri'; export interface IConnectionTemplateData { diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts similarity index 96% rename from src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts rename to src/sql/workbench/contrib/objectExplorer/browser/serverTreeView.ts index cfbcbe68b2..43edf109c5 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts +++ b/src/sql/workbench/contrib/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/workbench/parts/objectExplorer/browser/connectionTreeAction'; +import { ActiveConnectionsFilterAction } from 'sql/workbench/contrib/objectExplorer/browser/connectionTreeAction'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -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 { TreeCreationUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeCreationUtils'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; +import { TreeSelectionHandler } from 'sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/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/workbench/parts/objectExplorer/common/treeNode'; -import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; +import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/workbench/contrib/objectExplorer/common/serverGroup.contribution'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { ServerTreeActionProvider } from 'sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider'; +import { ServerTreeActionProvider } from 'sql/workbench/contrib/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/workbench/parts/objectExplorer/browser/treeCreationUtils.ts b/src/sql/workbench/contrib/objectExplorer/browser/treeCreationUtils.ts similarity index 81% rename from src/sql/workbench/parts/objectExplorer/browser/treeCreationUtils.ts rename to src/sql/workbench/contrib/objectExplorer/browser/treeCreationUtils.ts index 927d8d95ef..d8a3a604f3 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/treeCreationUtils.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/treeCreationUtils.ts @@ -8,14 +8,14 @@ import 'vs/css!./media/serverTreeActions'; 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/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 { ServerTreeRenderer } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeRenderer'; +import { ServerTreeDataSource } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeDataSource'; +import { ServerTreeController } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeController'; +import { ServerTreeActionProvider } from 'sql/workbench/contrib/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/workbench/parts/objectExplorer/browser/dragAndDropController'; -import { RecentConnectionDataSource } from 'sql/workbench/parts/objectExplorer/browser/recentConnectionDataSource'; +import { ServerTreeDragAndDrop, RecentConnectionsDragAndDrop } from 'sql/workbench/contrib/objectExplorer/browser/dragAndDropController'; +import { RecentConnectionDataSource } from 'sql/workbench/contrib/objectExplorer/browser/recentConnectionDataSource'; export class TreeCreationUtils { /** @@ -59,4 +59,4 @@ export class TreeCreationUtils { ariaLabel: nls.localize('treeCreation.regTreeAriaLabel', "Servers") }); } -} \ No newline at end of file +} diff --git a/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts b/src/sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler.ts similarity index 96% rename from src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts rename to src/sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler.ts index 9d5e763160..926ae7d098 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler.ts @@ -9,8 +9,8 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; // import { IProgressRunner, IProgressService } from 'vs/platform/progress/common/progress'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; export class TreeSelectionHandler { // progressRunner: IProgressRunner; diff --git a/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts b/src/sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils.ts similarity index 98% rename from src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts rename to src/sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils.ts index 5f871483f4..e3de2fe006 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils.ts @@ -8,9 +8,9 @@ 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/browser/objectExplorerService'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import * as errors from 'vs/base/common/errors'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Disposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/workbench/parts/objectExplorer/common/nodeType.ts b/src/sql/workbench/contrib/objectExplorer/common/nodeType.ts similarity index 100% rename from src/sql/workbench/parts/objectExplorer/common/nodeType.ts rename to src/sql/workbench/contrib/objectExplorer/common/nodeType.ts diff --git a/src/sql/workbench/parts/objectExplorer/common/serverGroup.contribution.ts b/src/sql/workbench/contrib/objectExplorer/common/serverGroup.contribution.ts similarity index 100% rename from src/sql/workbench/parts/objectExplorer/common/serverGroup.contribution.ts rename to src/sql/workbench/contrib/objectExplorer/common/serverGroup.contribution.ts diff --git a/src/sql/workbench/parts/objectExplorer/common/serverGroupViewModel.ts b/src/sql/workbench/contrib/objectExplorer/common/serverGroupViewModel.ts similarity index 100% rename from src/sql/workbench/parts/objectExplorer/common/serverGroupViewModel.ts rename to src/sql/workbench/contrib/objectExplorer/common/serverGroupViewModel.ts diff --git a/src/sql/workbench/parts/objectExplorer/common/treeNode.ts b/src/sql/workbench/contrib/objectExplorer/common/treeNode.ts similarity index 98% rename from src/sql/workbench/parts/objectExplorer/common/treeNode.ts rename to src/sql/workbench/contrib/objectExplorer/common/treeNode.ts index 58a863a8b8..6e0172bbef 100644 --- a/src/sql/workbench/parts/objectExplorer/common/treeNode.ts +++ b/src/sql/workbench/contrib/objectExplorer/common/treeNode.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { NodeType, SqlThemeIcon } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { NodeType, SqlThemeIcon } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import * as azdata from 'sqlops'; import * as UUID from 'vs/base/common/uuid'; diff --git a/src/sql/workbench/parts/objectExplorer/common/treeNodeContextKey.ts b/src/sql/workbench/contrib/objectExplorer/common/treeNodeContextKey.ts similarity index 96% rename from src/sql/workbench/parts/objectExplorer/common/treeNodeContextKey.ts rename to src/sql/workbench/contrib/objectExplorer/common/treeNodeContextKey.ts index 1d772ac263..993513925a 100644 --- a/src/sql/workbench/parts/objectExplorer/common/treeNodeContextKey.ts +++ b/src/sql/workbench/contrib/objectExplorer/common/treeNodeContextKey.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; export class TreeNodeContextKey implements IContextKey { diff --git a/src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts b/src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts similarity index 96% rename from src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts rename to src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts index cfa0ab788a..8911fa7cf3 100644 --- a/src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts +++ b/src/sql/workbench/contrib/objectExplorer/test/browser/connectionTreeActions.test.ts @@ -11,26 +11,26 @@ import { RefreshAction, AddServerAction, DeleteConnectionAction, DisconnectConnectionAction, ActiveConnectionsFilterAction, RecentConnectionsFilterAction } - from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; + from 'sql/workbench/contrib/objectExplorer/browser/connectionTreeAction'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; -import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; -import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants'; +import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeView'; +import * as LocalizedConstants from 'sql/workbench/contrib/connection/common/localizedConstants'; import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; -import { ServerTreeDataSource } from 'sql/workbench/parts/objectExplorer/browser/serverTreeDataSource'; +import { ServerTreeDataSource } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeDataSource'; import { Emitter } from 'vs/base/common/event'; import Severity from 'vs/base/common/severity'; -import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; +import { ObjectExplorerActionsContext } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; import { IConnectionResult, IConnectionParams } from 'sql/platform/connection/common/connectionManagement'; -import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; +import { TreeSelectionHandler } from 'sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { UNSAVED_GROUP_ID, mssqlProviderName } from 'sql/platform/connection/common/constants'; import { $ } from 'vs/base/browser/dom'; -import { OEManageConnectionAction } from 'sql/workbench/parts/dashboard/browser/dashboardActions'; +import { OEManageConnectionAction } from 'sql/workbench/contrib/dashboard/browser/dashboardActions'; import { IViewsService, IView, ViewContainer, IViewDescriptorCollection } from 'vs/workbench/common/views'; import { ConsoleLogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/parts/objectExplorer/test/browser/serverTreeView.test.ts b/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts similarity index 98% rename from src/sql/workbench/parts/objectExplorer/test/browser/serverTreeView.test.ts rename to src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts index c3228e19a4..33d794847f 100644 --- a/src/sql/workbench/parts/objectExplorer/test/browser/serverTreeView.test.ts +++ b/src/sql/workbench/contrib/objectExplorer/test/browser/serverTreeView.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeView'; import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; diff --git a/src/sql/workbench/parts/profiler/browser/media/clear.svg b/src/sql/workbench/contrib/profiler/browser/media/clear.svg similarity index 100% rename from src/sql/workbench/parts/profiler/browser/media/clear.svg rename to src/sql/workbench/contrib/profiler/browser/media/clear.svg diff --git a/src/sql/workbench/parts/profiler/browser/media/clear_inverse.svg b/src/sql/workbench/contrib/profiler/browser/media/clear_inverse.svg similarity index 100% rename from src/sql/workbench/parts/profiler/browser/media/clear_inverse.svg rename to src/sql/workbench/contrib/profiler/browser/media/clear_inverse.svg diff --git a/src/sql/workbench/parts/profiler/browser/media/profiler.css b/src/sql/workbench/contrib/profiler/browser/media/profiler.css similarity index 100% rename from src/sql/workbench/parts/profiler/browser/media/profiler.css rename to src/sql/workbench/contrib/profiler/browser/media/profiler.css diff --git a/src/sql/workbench/parts/profiler/browser/media/profilerFilterDialog.css b/src/sql/workbench/contrib/profiler/browser/media/profilerFilterDialog.css similarity index 100% rename from src/sql/workbench/parts/profiler/browser/media/profilerFilterDialog.css rename to src/sql/workbench/contrib/profiler/browser/media/profilerFilterDialog.css diff --git a/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts b/src/sql/workbench/contrib/profiler/browser/profiler.contribution.ts similarity index 98% rename from src/sql/workbench/parts/profiler/browser/profiler.contribution.ts rename to src/sql/workbench/contrib/profiler/browser/profiler.contribution.ts index def0da2e19..eece993279 100644 --- a/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts +++ b/src/sql/workbench/contrib/profiler/browser/profiler.contribution.ts @@ -10,8 +10,8 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigu import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import * as nls from 'vs/nls'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; -import { ProfilerEditor } from 'sql/workbench/parts/profiler/browser/profilerEditor'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; +import { ProfilerEditor } from 'sql/workbench/contrib/profiler/browser/profilerEditor'; import { PROFILER_VIEW_TEMPLATE_SETTINGS, PROFILER_SESSION_TEMPLATE_SETTINGS, IProfilerViewTemplate, IProfilerSessionTemplate, EngineType, PROFILER_FILTER_SETTINGS } from 'sql/workbench/services/profiler/browser/interfaces'; const profilerDescriptor = new EditorDescriptor( diff --git a/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts b/src/sql/workbench/contrib/profiler/browser/profilerActions.contribution.ts similarity index 94% rename from src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts rename to src/sql/workbench/contrib/profiler/browser/profilerActions.contribution.ts index 6439746b9f..2ee3396ae9 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerActions.contribution.ts @@ -7,12 +7,12 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; -import { ProfilerEditor } from 'sql/workbench/parts/profiler/browser/profilerEditor'; -import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; +import { ProfilerEditor } from 'sql/workbench/contrib/profiler/browser/profilerEditor'; +import { ObjectExplorerActionsContext } from 'sql/workbench/contrib/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/workbench/parts/profiler/browser/profilerActions.ts b/src/sql/workbench/contrib/profiler/browser/profilerActions.ts similarity index 98% rename from src/sql/workbench/parts/profiler/browser/profilerActions.ts rename to src/sql/workbench/contrib/profiler/browser/profilerActions.ts index adb0d894d9..0816ce0837 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerActions.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerActions.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; -import { IProfilerController } from 'sql/workbench/parts/profiler/common/interfaces'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { IProfilerController } from 'sql/workbench/contrib/profiler/common/interfaces'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerColumnEditorDialog.ts b/src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts similarity index 99% rename from src/sql/workbench/parts/profiler/browser/profilerColumnEditorDialog.ts rename to src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts index bd45eb4a34..f27914895c 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerColumnEditorDialog.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts @@ -7,7 +7,7 @@ import 'vs/css!./media/profiler'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerCopyHandler.ts b/src/sql/workbench/contrib/profiler/browser/profilerCopyHandler.ts similarity index 100% rename from src/sql/workbench/parts/profiler/browser/profilerCopyHandler.ts rename to src/sql/workbench/contrib/profiler/browser/profilerCopyHandler.ts diff --git a/src/sql/workbench/parts/profiler/browser/profilerEditor.ts b/src/sql/workbench/contrib/profiler/browser/profilerEditor.ts similarity index 97% rename from src/sql/workbench/parts/profiler/browser/profilerEditor.ts rename to src/sql/workbench/contrib/profiler/browser/profilerEditor.ts index 732f6fd296..9cad6218ba 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerEditor.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerEditor.ts @@ -3,20 +3,20 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import { TabbedPanel } from 'sql/base/browser/ui/panel/panel'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/browser/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { attachTableStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; -import { IProfilerStateChangedEvent } from 'sql/workbench/parts/profiler/common/profilerState'; -import { ProfilerTableEditor, ProfilerTableViewState } from 'sql/workbench/parts/profiler/browser/profilerTableEditor'; -import * as Actions from 'sql/workbench/parts/profiler/browser/profilerActions'; -import { CONTEXT_PROFILER_EDITOR, PROFILER_TABLE_COMMAND_SEARCH } from 'sql/workbench/parts/profiler/common/interfaces'; +import { IProfilerStateChangedEvent } from 'sql/workbench/contrib/profiler/common/profilerState'; +import { ProfilerTableEditor, ProfilerTableViewState } from 'sql/workbench/contrib/profiler/browser/profilerTableEditor'; +import * as Actions from 'sql/workbench/contrib/profiler/browser/profilerActions'; +import { CONTEXT_PROFILER_EDITOR, PROFILER_TABLE_COMMAND_SEARCH } from 'sql/workbench/contrib/profiler/common/interfaces'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { textFormatter, slickGridDataItemColumnValueExtractor } from 'sql/base/browser/ui/table/formatters'; -import { ProfilerResourceEditor } from 'sql/workbench/parts/profiler/browser/profilerResourceEditor'; +import { ProfilerResourceEditor } from 'sql/workbench/contrib/profiler/browser/profilerResourceEditor'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { ITextModel } from 'vs/editor/common/model'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; @@ -49,7 +49,7 @@ import { clamp } from 'vs/base/common/numbers'; import { CopyKeybind } from 'sql/base/browser/ui/table/plugins/copyKeybind.plugin'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; -import { handleCopyRequest } from 'sql/workbench/parts/profiler/browser/profilerCopyHandler'; +import { handleCopyRequest } from 'sql/workbench/contrib/profiler/browser/profilerCopyHandler'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts b/src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts similarity index 99% rename from src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts rename to src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts index 9110b48571..95a0c5b34c 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts @@ -13,7 +13,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { localize } from 'vs/nls'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerFindWidget.ts b/src/sql/workbench/contrib/profiler/browser/profilerFindWidget.ts similarity index 100% rename from src/sql/workbench/parts/profiler/browser/profilerFindWidget.ts rename to src/sql/workbench/contrib/profiler/browser/profilerFindWidget.ts diff --git a/src/sql/workbench/parts/profiler/browser/profilerInput.ts b/src/sql/workbench/contrib/profiler/browser/profilerInput.ts similarity index 99% rename from src/sql/workbench/parts/profiler/browser/profilerInput.ts rename to src/sql/workbench/contrib/profiler/browser/profilerInput.ts index 6e5a2174c3..7305dcfb0c 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerInput.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerInput.ts @@ -5,7 +5,7 @@ import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { IProfilerSession, IProfilerService, ProfilerSessionID, IProfilerViewTemplate, ProfilerFilter } from 'sql/workbench/services/profiler/browser/interfaces'; -import { ProfilerState } from 'sql/workbench/parts/profiler/common/profilerState'; +import { ProfilerState } from 'sql/workbench/contrib/profiler/common/profilerState'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as azdata from 'azdata'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerResourceEditor.ts b/src/sql/workbench/contrib/profiler/browser/profilerResourceEditor.ts similarity index 100% rename from src/sql/workbench/parts/profiler/browser/profilerResourceEditor.ts rename to src/sql/workbench/contrib/profiler/browser/profilerResourceEditor.ts diff --git a/src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts b/src/sql/workbench/contrib/profiler/browser/profilerTableEditor.ts similarity index 95% rename from src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts rename to src/sql/workbench/contrib/profiler/browser/profilerTableEditor.ts index 570ecd8f60..e9a8465cfa 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerTableEditor.ts @@ -3,14 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IProfilerController } from 'sql/workbench/parts/profiler/common/interfaces'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { IProfilerController } from 'sql/workbench/contrib/profiler/common/interfaces'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import { Table } from 'sql/base/browser/ui/table/table'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin'; -import { IProfilerStateChangedEvent } from 'sql/workbench/parts/profiler/common/profilerState'; -import { FindWidget, ITableController, IConfigurationChangedEvent, ACTION_IDS, PROFILER_MAX_MATCHES } from 'sql/workbench/parts/profiler/browser/profilerFindWidget'; -import { ProfilerFindNext, ProfilerFindPrevious } from 'sql/workbench/parts/profiler/browser/profilerActions'; +import { IProfilerStateChangedEvent } from 'sql/workbench/contrib/profiler/common/profilerState'; +import { FindWidget, ITableController, IConfigurationChangedEvent, ACTION_IDS, PROFILER_MAX_MATCHES } from 'sql/workbench/contrib/profiler/browser/profilerFindWidget'; +import { ProfilerFindNext, ProfilerFindPrevious } from 'sql/workbench/contrib/profiler/browser/profilerActions'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IDisposable } from 'vs/base/common/lifecycle'; @@ -31,7 +31,7 @@ import { IStatusbarService, StatusbarAlignment } from 'vs/workbench/services/sta import { localize } from 'vs/nls'; import { CopyKeybind } from 'sql/base/browser/ui/table/plugins/copyKeybind.plugin'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; -import { handleCopyRequest } from 'sql/workbench/parts/profiler/browser/profilerCopyHandler'; +import { handleCopyRequest } from 'sql/workbench/contrib/profiler/browser/profilerCopyHandler'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; export interface ProfilerTableViewState { diff --git a/src/sql/workbench/parts/profiler/common/interfaces.ts b/src/sql/workbench/contrib/profiler/common/interfaces.ts similarity index 100% rename from src/sql/workbench/parts/profiler/common/interfaces.ts rename to src/sql/workbench/contrib/profiler/common/interfaces.ts diff --git a/src/sql/workbench/parts/profiler/common/profilerState.ts b/src/sql/workbench/contrib/profiler/common/profilerState.ts similarity index 100% rename from src/sql/workbench/parts/profiler/common/profilerState.ts rename to src/sql/workbench/contrib/profiler/common/profilerState.ts diff --git a/src/sql/workbench/parts/query/browser/actions.ts b/src/sql/workbench/contrib/query/browser/actions.ts similarity index 98% rename from src/sql/workbench/parts/query/browser/actions.ts rename to src/sql/workbench/contrib/query/browser/actions.ts index e7e643bae8..c07e3d2901 100644 --- a/src/sql/workbench/parts/query/browser/actions.ts +++ b/src/sql/workbench/contrib/query/browser/actions.ts @@ -9,7 +9,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IExtensionTipsService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; -import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; +import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import { Table } from 'sql/base/browser/ui/table/table'; import { QueryEditor } from './queryEditor'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; @@ -18,7 +18,7 @@ import { removeAnsiEscapeCodes } from 'vs/base/common/strings'; import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider'; import { INotificationService } from 'vs/platform/notification/common/notification'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { GridTableState } from 'sql/workbench/parts/query/common/gridPanelState'; +import { GridTableState } from 'sql/workbench/contrib/query/common/gridPanelState'; import * as Constants from 'sql/workbench/contrib/extensions/common/constants'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; diff --git a/src/sql/workbench/parts/query/browser/flavorStatus.ts b/src/sql/workbench/contrib/query/browser/flavorStatus.ts similarity index 100% rename from src/sql/workbench/parts/query/browser/flavorStatus.ts rename to src/sql/workbench/contrib/query/browser/flavorStatus.ts diff --git a/src/sql/workbench/parts/query/browser/flexibleSash.ts b/src/sql/workbench/contrib/query/browser/flexibleSash.ts similarity index 100% rename from src/sql/workbench/parts/query/browser/flexibleSash.ts rename to src/sql/workbench/contrib/query/browser/flexibleSash.ts diff --git a/src/sql/workbench/parts/query/browser/gridPanel.ts b/src/sql/workbench/contrib/query/browser/gridPanel.ts similarity index 99% rename from src/sql/workbench/parts/query/browser/gridPanel.ts rename to src/sql/workbench/contrib/query/browser/gridPanel.ts index c96be78bf5..8512550054 100644 --- a/src/sql/workbench/parts/query/browser/gridPanel.ts +++ b/src/sql/workbench/contrib/query/browser/gridPanel.ts @@ -12,8 +12,8 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { ScrollableSplitView, IView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin'; import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; -import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; -import { IGridActionContext, SaveResultAction, CopyResultAction, SelectAllGridAction, MaximizeTableAction, RestoreTableAction, ChartDataAction, VisualizerDataAction } from 'sql/workbench/parts/query/browser/actions'; +import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; +import { IGridActionContext, SaveResultAction, CopyResultAction, SelectAllGridAction, MaximizeTableAction, RestoreTableAction, ChartDataAction, VisualizerDataAction } from 'sql/workbench/contrib/query/browser/actions'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { escape } from 'sql/base/common/strings'; @@ -46,7 +46,7 @@ import { localize } from 'vs/nls'; import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider'; import { formatDocumentWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/format'; import { CancellationToken } from 'vs/base/common/cancellation'; -import { GridPanelState, GridTableState } from 'sql/workbench/parts/query/common/gridPanelState'; +import { GridPanelState, GridTableState } from 'sql/workbench/contrib/query/common/gridPanelState'; const ROW_HEIGHT = 29; const HEADER_HEIGHT = 26; diff --git a/src/sql/workbench/parts/query/browser/keyboardQueryActions.ts b/src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts similarity index 97% rename from src/sql/workbench/parts/query/browser/keyboardQueryActions.ts rename to src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts index 3005538a3f..636864a91b 100644 --- a/src/sql/workbench/parts/query/browser/keyboardQueryActions.ts +++ b/src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts @@ -12,15 +12,15 @@ import * as azdata from 'azdata'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; +import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import * as Constants from 'sql/workbench/parts/query/common/constants'; +import * as Constants from 'sql/workbench/contrib/query/common/constants'; import * as ConnectionConstants from 'sql/platform/connection/common/constants'; -import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; +import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { firstIndex } from 'vs/base/common/arrays'; const singleQuote = '\''; diff --git a/src/sql/workbench/parts/query/browser/media/binarydiffeditor.css b/src/sql/workbench/contrib/query/browser/media/binarydiffeditor.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/binarydiffeditor.css rename to src/sql/workbench/contrib/query/browser/media/binarydiffeditor.css diff --git a/src/sql/workbench/parts/query/browser/media/close-dirty-inverse.svg b/src/sql/workbench/contrib/query/browser/media/close-dirty-inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/close-dirty-inverse.svg rename to src/sql/workbench/contrib/query/browser/media/close-dirty-inverse.svg diff --git a/src/sql/workbench/parts/query/browser/media/close-dirty.svg b/src/sql/workbench/contrib/query/browser/media/close-dirty.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/close-dirty.svg rename to src/sql/workbench/contrib/query/browser/media/close-dirty.svg diff --git a/src/sql/workbench/parts/query/browser/media/close-inverse.svg b/src/sql/workbench/contrib/query/browser/media/close-inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/close-inverse.svg rename to src/sql/workbench/contrib/query/browser/media/close-inverse.svg diff --git a/src/sql/workbench/parts/query/browser/media/close.svg b/src/sql/workbench/contrib/query/browser/media/close.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/close.svg rename to src/sql/workbench/contrib/query/browser/media/close.svg diff --git a/src/sql/workbench/parts/query/browser/media/editorGroupsControl.css b/src/sql/workbench/contrib/query/browser/media/editorGroupsControl.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/editorGroupsControl.css rename to src/sql/workbench/contrib/query/browser/media/editorGroupsControl.css diff --git a/src/sql/workbench/parts/query/browser/media/editorpart.css b/src/sql/workbench/contrib/query/browser/media/editorpart.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/editorpart.css rename to src/sql/workbench/contrib/query/browser/media/editorpart.css diff --git a/src/sql/workbench/parts/query/browser/media/editorpicker.css b/src/sql/workbench/contrib/query/browser/media/editorpicker.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/editorpicker.css rename to src/sql/workbench/contrib/query/browser/media/editorpicker.css diff --git a/src/sql/workbench/parts/query/browser/media/editorstatus.css b/src/sql/workbench/contrib/query/browser/media/editorstatus.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/editorstatus.css rename to src/sql/workbench/contrib/query/browser/media/editorstatus.css diff --git a/src/sql/workbench/parts/query/browser/media/flavorStatus.css b/src/sql/workbench/contrib/query/browser/media/flavorStatus.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/flavorStatus.css rename to src/sql/workbench/contrib/query/browser/media/flavorStatus.css diff --git a/src/sql/workbench/parts/query/browser/media/gridPanel.css b/src/sql/workbench/contrib/query/browser/media/gridPanel.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/gridPanel.css rename to src/sql/workbench/contrib/query/browser/media/gridPanel.css diff --git a/src/sql/workbench/parts/query/browser/media/letterpress-dark.svg b/src/sql/workbench/contrib/query/browser/media/letterpress-dark.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/letterpress-dark.svg rename to src/sql/workbench/contrib/query/browser/media/letterpress-dark.svg diff --git a/src/sql/workbench/parts/query/browser/media/letterpress-hc.svg b/src/sql/workbench/contrib/query/browser/media/letterpress-hc.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/letterpress-hc.svg rename to src/sql/workbench/contrib/query/browser/media/letterpress-hc.svg diff --git a/src/sql/workbench/parts/query/browser/media/letterpress.svg b/src/sql/workbench/contrib/query/browser/media/letterpress.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/letterpress.svg rename to src/sql/workbench/contrib/query/browser/media/letterpress.svg diff --git a/src/sql/workbench/parts/query/browser/media/messagePanel.css b/src/sql/workbench/contrib/query/browser/media/messagePanel.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/messagePanel.css rename to src/sql/workbench/contrib/query/browser/media/messagePanel.css diff --git a/src/sql/workbench/parts/query/browser/media/next-diff-inverse.svg b/src/sql/workbench/contrib/query/browser/media/next-diff-inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/next-diff-inverse.svg rename to src/sql/workbench/contrib/query/browser/media/next-diff-inverse.svg diff --git a/src/sql/workbench/parts/query/browser/media/next-diff.svg b/src/sql/workbench/contrib/query/browser/media/next-diff.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/next-diff.svg rename to src/sql/workbench/contrib/query/browser/media/next-diff.svg diff --git a/src/sql/workbench/parts/query/browser/media/notabstitle.css b/src/sql/workbench/contrib/query/browser/media/notabstitle.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/notabstitle.css rename to src/sql/workbench/contrib/query/browser/media/notabstitle.css diff --git a/src/sql/workbench/parts/query/browser/media/parseQuery.svg b/src/sql/workbench/contrib/query/browser/media/parseQuery.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/parseQuery.svg rename to src/sql/workbench/contrib/query/browser/media/parseQuery.svg diff --git a/src/sql/workbench/parts/query/browser/media/previous-diff-inverse.svg b/src/sql/workbench/contrib/query/browser/media/previous-diff-inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/previous-diff-inverse.svg rename to src/sql/workbench/contrib/query/browser/media/previous-diff-inverse.svg diff --git a/src/sql/workbench/parts/query/browser/media/previous-diff.svg b/src/sql/workbench/contrib/query/browser/media/previous-diff.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/previous-diff.svg rename to src/sql/workbench/contrib/query/browser/media/previous-diff.svg diff --git a/src/sql/workbench/parts/query/browser/media/queryActions.css b/src/sql/workbench/contrib/query/browser/media/queryActions.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/queryActions.css rename to src/sql/workbench/contrib/query/browser/media/queryActions.css diff --git a/src/sql/workbench/parts/query/browser/media/queryEditor.css b/src/sql/workbench/contrib/query/browser/media/queryEditor.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/queryEditor.css rename to src/sql/workbench/contrib/query/browser/media/queryEditor.css diff --git a/src/sql/workbench/parts/query/browser/media/runWithoutDebug.svg b/src/sql/workbench/contrib/query/browser/media/runWithoutDebug.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/runWithoutDebug.svg rename to src/sql/workbench/contrib/query/browser/media/runWithoutDebug.svg diff --git a/src/sql/workbench/parts/query/browser/media/sidebysideEditor.css b/src/sql/workbench/contrib/query/browser/media/sidebysideEditor.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/sidebysideEditor.css rename to src/sql/workbench/contrib/query/browser/media/sidebysideEditor.css diff --git a/src/sql/workbench/parts/query/browser/media/split-editor-horizontal-inverse.svg b/src/sql/workbench/contrib/query/browser/media/split-editor-horizontal-inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/split-editor-horizontal-inverse.svg rename to src/sql/workbench/contrib/query/browser/media/split-editor-horizontal-inverse.svg diff --git a/src/sql/workbench/parts/query/browser/media/split-editor-horizontal.svg b/src/sql/workbench/contrib/query/browser/media/split-editor-horizontal.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/split-editor-horizontal.svg rename to src/sql/workbench/contrib/query/browser/media/split-editor-horizontal.svg diff --git a/src/sql/workbench/parts/query/browser/media/split-editor-vertical-inverse.svg b/src/sql/workbench/contrib/query/browser/media/split-editor-vertical-inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/split-editor-vertical-inverse.svg rename to src/sql/workbench/contrib/query/browser/media/split-editor-vertical-inverse.svg diff --git a/src/sql/workbench/parts/query/browser/media/split-editor-vertical.svg b/src/sql/workbench/contrib/query/browser/media/split-editor-vertical.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/split-editor-vertical.svg rename to src/sql/workbench/contrib/query/browser/media/split-editor-vertical.svg diff --git a/src/sql/workbench/parts/query/browser/media/stackview-inverse.svg b/src/sql/workbench/contrib/query/browser/media/stackview-inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/stackview-inverse.svg rename to src/sql/workbench/contrib/query/browser/media/stackview-inverse.svg diff --git a/src/sql/workbench/parts/query/browser/media/stackview.svg b/src/sql/workbench/contrib/query/browser/media/stackview.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/media/stackview.svg rename to src/sql/workbench/contrib/query/browser/media/stackview.svg diff --git a/src/sql/workbench/parts/query/browser/media/tabstitle.css b/src/sql/workbench/contrib/query/browser/media/tabstitle.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/tabstitle.css rename to src/sql/workbench/contrib/query/browser/media/tabstitle.css diff --git a/src/sql/workbench/parts/query/browser/media/textdiffeditor.css b/src/sql/workbench/contrib/query/browser/media/textdiffeditor.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/textdiffeditor.css rename to src/sql/workbench/contrib/query/browser/media/textdiffeditor.css diff --git a/src/sql/workbench/parts/query/browser/media/titlecontrol.css b/src/sql/workbench/contrib/query/browser/media/titlecontrol.css similarity index 100% rename from src/sql/workbench/parts/query/browser/media/titlecontrol.css rename to src/sql/workbench/contrib/query/browser/media/titlecontrol.css diff --git a/src/sql/workbench/parts/query/browser/messagePanel.ts b/src/sql/workbench/contrib/query/browser/messagePanel.ts similarity index 98% rename from src/sql/workbench/parts/query/browser/messagePanel.ts rename to src/sql/workbench/contrib/query/browser/messagePanel.ts index c71ce4fbc0..59f96dc155 100644 --- a/src/sql/workbench/parts/query/browser/messagePanel.ts +++ b/src/sql/workbench/contrib/query/browser/messagePanel.ts @@ -6,7 +6,7 @@ import 'vs/css!./media/messagePanel'; import { IMessagesActionContext, CopyMessagesAction, CopyAllMessagesAction } from './actions'; import QueryRunner, { IQueryMessage } from 'sql/platform/query/common/queryRunner'; -import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import { ISelectionData } from 'azdata'; @@ -26,10 +26,10 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { $, Dimension, createStyleSheet } from 'vs/base/browser/dom'; -import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; +import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { resultsErrorColor } from 'sql/platform/theme/common/colors'; -import { MessagePanelState } from 'sql/workbench/parts/query/common/messagePanelState'; +import { MessagePanelState } from 'sql/workbench/contrib/query/common/messagePanelState'; export interface IResultMessageIntern extends IQueryMessage { id?: string; diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/media/dialogModal.css b/src/sql/workbench/contrib/query/browser/modelViewTab/media/dialogModal.css similarity index 100% rename from src/sql/workbench/parts/query/browser/modelViewTab/media/dialogModal.css rename to src/sql/workbench/contrib/query/browser/modelViewTab/media/dialogModal.css diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/media/loading.svg b/src/sql/workbench/contrib/query/browser/modelViewTab/media/loading.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/modelViewTab/media/loading.svg rename to src/sql/workbench/contrib/query/browser/modelViewTab/media/loading.svg diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/media/loading_inverse.svg b/src/sql/workbench/contrib/query/browser/modelViewTab/media/loading_inverse.svg similarity index 100% rename from src/sql/workbench/parts/query/browser/modelViewTab/media/loading_inverse.svg rename to src/sql/workbench/contrib/query/browser/modelViewTab/media/loading_inverse.svg diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/media/wizardNavigation.css b/src/sql/workbench/contrib/query/browser/modelViewTab/media/wizardNavigation.css similarity index 100% rename from src/sql/workbench/parts/query/browser/modelViewTab/media/wizardNavigation.css rename to src/sql/workbench/contrib/query/browser/modelViewTab/media/wizardNavigation.css diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module.ts b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts similarity index 93% rename from src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module.ts rename to src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts index 3e52c84bac..a36c5d3f5a 100644 --- a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module.ts +++ b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module.ts @@ -13,11 +13,11 @@ import { WizardNavigation } from 'sql/workbench/services/dialog/browser/wizardNa import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/modelComponentWrapper.component'; -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component'; -import { QueryModelViewTabContainer } from 'sql/workbench/parts/query/browser/modelViewTab/queryModelViewTabContainer.component'; +import { QueryModelViewTabContainer } from 'sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.ts b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.ts similarity index 92% rename from src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.ts rename to src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.ts index bb7521efc7..2d252100ea 100644 --- a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.ts +++ b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.ts @@ -8,8 +8,8 @@ import { dispose } from 'vs/base/common/lifecycle'; import { IPanelView, IPanelTab } from 'sql/base/browser/ui/panel/panel'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; -import { QueryModelViewTabModule } from 'sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module'; -import { QueryModelViewState } from 'sql/workbench/parts/query/common/modelViewTab/modelViewState'; +import { QueryModelViewTabModule } from 'sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab.module'; +import { QueryModelViewState } from 'sql/workbench/contrib/query/common/modelViewTab/modelViewState'; export class QueryModelViewTab implements IPanelTab { public identifier = 'QueryModelViewTab_'; diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTabContainer.component.ts b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component.ts similarity index 100% rename from src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTabContainer.component.ts rename to src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component.ts diff --git a/src/sql/workbench/parts/query/browser/query.contribution.ts b/src/sql/workbench/contrib/query/browser/query.contribution.ts similarity index 94% rename from src/sql/workbench/parts/query/browser/query.contribution.ts rename to src/sql/workbench/contrib/query/browser/query.contribution.ts index dd8c042533..0578c4a9ee 100644 --- a/src/sql/workbench/parts/query/browser/query.contribution.ts +++ b/src/sql/workbench/contrib/query/browser/query.contribution.ts @@ -15,30 +15,30 @@ import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/co import { ContextKeyExpr, ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; -import { QueryResultsEditor } from 'sql/workbench/parts/query/browser/queryResultsEditor'; -import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; -import * as queryContext from 'sql/workbench/parts/query/common/queryContext'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; +import { QueryResultsEditor } from 'sql/workbench/contrib/query/browser/queryResultsEditor'; +import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; +import * as queryContext from 'sql/workbench/contrib/query/common/queryContext'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { RunQueryKeyboardAction, RunCurrentQueryKeyboardAction, CancelQueryKeyboardAction, RefreshIntellisenseKeyboardAction, ToggleQueryResultsKeyboardAction, RunQueryShortcutAction, RunCurrentQueryWithActualPlanKeyboardAction, FocusOnCurrentQueryKeyboardAction, ParseSyntaxAction -} from 'sql/workbench/parts/query/browser/keyboardQueryActions'; -import * as gridActions from 'sql/workbench/parts/editData/common/gridActions'; -import * as gridCommands from 'sql/workbench/parts/editData/browser/gridCommands'; -import * as Constants from 'sql/workbench/parts/query/common/constants'; +} from 'sql/workbench/contrib/query/browser/keyboardQueryActions'; +import * as gridActions from 'sql/workbench/contrib/editData/common/gridActions'; +import * as gridCommands from 'sql/workbench/contrib/editData/browser/gridCommands'; +import * as Constants from 'sql/workbench/contrib/query/common/constants'; import { localize } from 'vs/nls'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; -import { TimeElapsedStatusBarContributions, RowCountStatusBarContributions, QueryStatusStatusBarContributions } from 'sql/workbench/parts/query/browser/statusBarItems'; -import { SqlFlavorStatusbarItem } from 'sql/workbench/parts/query/browser/flavorStatus'; -import { NewQueryTask, OE_NEW_QUERY_ACTION_ID, DE_NEW_QUERY_COMMAND_ID } from 'sql/workbench/parts/query/browser/queryActions'; -import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; +import { TimeElapsedStatusBarContributions, RowCountStatusBarContributions, QueryStatusStatusBarContributions } from 'sql/workbench/contrib/query/browser/statusBarItems'; +import { SqlFlavorStatusbarItem } from 'sql/workbench/contrib/query/browser/flavorStatus'; +import { NewQueryTask, OE_NEW_QUERY_ACTION_ID, DE_NEW_QUERY_COMMAND_ID } from 'sql/workbench/contrib/query/browser/queryActions'; +import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; import { ManageActionContext } from 'sql/workbench/browser/actions'; -import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; +import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext'; export const QueryEditorVisibleCondition = ContextKeyExpr.has(queryContext.queryEditorVisibleId); export const ResultsGridFocusCondition = ContextKeyExpr.and(ContextKeyExpr.has(queryContext.resultsVisibleId), ContextKeyExpr.has(queryContext.resultsGridFocussedId)); diff --git a/src/sql/workbench/parts/query/browser/queryActions.ts b/src/sql/workbench/contrib/query/browser/queryActions.ts similarity index 99% rename from src/sql/workbench/parts/query/browser/queryActions.ts rename to src/sql/workbench/contrib/query/browser/queryActions.ts index e37af13aff..a1ea339bc6 100644 --- a/src/sql/workbench/parts/query/browser/queryActions.ts +++ b/src/sql/workbench/contrib/query/browser/queryActions.ts @@ -24,7 +24,7 @@ import { IConnectionCompletionOptions, IConnectableInput } from 'sql/platform/connection/common/connectionManagement'; -import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; +import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler'; @@ -37,7 +37,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { getCurrentGlobalConnection } from 'sql/workbench/browser/taskUtilities'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; -import { OEAction } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; +import { OEAction } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/parts/query/browser/queryEditor.ts b/src/sql/workbench/contrib/query/browser/queryEditor.ts similarity index 98% rename from src/sql/workbench/parts/query/browser/queryEditor.ts rename to src/sql/workbench/contrib/query/browser/queryEditor.ts index 4326efd354..721821485b 100644 --- a/src/sql/workbench/parts/query/browser/queryEditor.ts +++ b/src/sql/workbench/contrib/query/browser/queryEditor.ts @@ -31,11 +31,11 @@ import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileE import { URI } from 'vs/base/common/uri'; import { IFileService, FileChangesEvent } from 'vs/platform/files/common/files'; -import { QueryInput, IQueryEditorStateChange } from 'sql/workbench/parts/query/common/queryInput'; -import { QueryResultsEditor } from 'sql/workbench/parts/query/browser/queryResultsEditor'; -import * as queryContext from 'sql/workbench/parts/query/common/queryContext'; +import { QueryInput, IQueryEditorStateChange } from 'sql/workbench/contrib/query/common/queryInput'; +import { QueryResultsEditor } from 'sql/workbench/contrib/query/browser/queryResultsEditor'; +import * as queryContext from 'sql/workbench/contrib/query/common/queryContext'; import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar'; -import * as actions from 'sql/workbench/parts/query/browser/queryActions'; +import * as actions from 'sql/workbench/contrib/query/browser/queryActions'; const QUERY_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'queryEditorViewState'; diff --git a/src/sql/workbench/parts/query/browser/queryResultsEditor.ts b/src/sql/workbench/contrib/query/browser/queryResultsEditor.ts similarity index 95% rename from src/sql/workbench/parts/query/browser/queryResultsEditor.ts rename to src/sql/workbench/contrib/query/browser/queryResultsEditor.ts index 8bce163063..167c93dc08 100644 --- a/src/sql/workbench/parts/query/browser/queryResultsEditor.ts +++ b/src/sql/workbench/contrib/query/browser/queryResultsEditor.ts @@ -15,11 +15,11 @@ import * as DOM from 'vs/base/browser/dom'; import * as types from 'vs/base/common/types'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; -import { QueryResultsView } from 'sql/workbench/parts/query/browser/queryResultsView'; +import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; +import { QueryResultsView } from 'sql/workbench/contrib/query/browser/queryResultsView'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; -import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/parts/query/common/resultsGridContribution'; +import { RESULTS_GRID_DEFAULTS } from 'sql/workbench/contrib/query/common/resultsGridContribution'; export const TextCompareEditorVisible = new RawContextKey('textCompareEditorVisible', false); diff --git a/src/sql/workbench/parts/query/browser/queryResultsView.ts b/src/sql/workbench/contrib/query/browser/queryResultsView.ts similarity index 94% rename from src/sql/workbench/parts/query/browser/queryResultsView.ts rename to src/sql/workbench/contrib/query/browser/queryResultsView.ts index 3a14e2d2ff..b65a4b96bf 100644 --- a/src/sql/workbench/parts/query/browser/queryResultsView.ts +++ b/src/sql/workbench/contrib/query/browser/queryResultsView.ts @@ -3,18 +3,18 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { MessagePanel } from 'sql/workbench/parts/query/browser/messagePanel'; -import { GridPanel } from 'sql/workbench/parts/query/browser/gridPanel'; -import { ChartTab } from 'sql/workbench/parts/charts/browser/chartTab'; -import { QueryPlanTab } from 'sql/workbench/parts/queryPlan/browser/queryPlan'; -import { TopOperationsTab } from 'sql/workbench/parts/queryPlan/browser/topOperations'; -import { QueryModelViewTab } from 'sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab'; -import { MessagePanelState } from 'sql/workbench/parts/query/common/messagePanelState'; -import { GridPanelState } from 'sql/workbench/parts/query/common/gridPanelState'; +import { MessagePanel } from 'sql/workbench/contrib/query/browser/messagePanel'; +import { GridPanel } from 'sql/workbench/contrib/query/browser/gridPanel'; +import { ChartTab } from 'sql/workbench/contrib/charts/browser/chartTab'; +import { QueryPlanTab } from 'sql/workbench/contrib/queryPlan/browser/queryPlan'; +import { TopOperationsTab } from 'sql/workbench/contrib/queryPlan/browser/topOperations'; +import { QueryModelViewTab } from 'sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTab'; +import { MessagePanelState } from 'sql/workbench/contrib/query/common/messagePanelState'; +import { GridPanelState } from 'sql/workbench/contrib/query/common/gridPanelState'; import * as nls from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/parts/query/browser/statusBarItems.ts b/src/sql/workbench/contrib/query/browser/statusBarItems.ts similarity index 99% rename from src/sql/workbench/parts/query/browser/statusBarItems.ts rename to src/sql/workbench/contrib/query/browser/statusBarItems.ts index b03bbb32a2..96edc6f7ac 100644 --- a/src/sql/workbench/parts/query/browser/statusBarItems.ts +++ b/src/sql/workbench/contrib/query/browser/statusBarItems.ts @@ -9,7 +9,7 @@ import { IntervalTimer } from 'vs/base/common/async'; import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { localize } from 'vs/nls'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import QueryRunner from 'sql/platform/query/common/queryRunner'; import { parseNumAsTimeString } from 'sql/platform/connection/common/utils'; import { Event } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/query/common/constants.ts b/src/sql/workbench/contrib/query/common/constants.ts similarity index 100% rename from src/sql/workbench/parts/query/common/constants.ts rename to src/sql/workbench/contrib/query/common/constants.ts diff --git a/src/sql/workbench/parts/query/common/gridPanelState.ts b/src/sql/workbench/contrib/query/common/gridPanelState.ts similarity index 100% rename from src/sql/workbench/parts/query/common/gridPanelState.ts rename to src/sql/workbench/contrib/query/common/gridPanelState.ts diff --git a/src/sql/workbench/parts/query/common/localizedConstants.ts b/src/sql/workbench/contrib/query/common/localizedConstants.ts similarity index 100% rename from src/sql/workbench/parts/query/common/localizedConstants.ts rename to src/sql/workbench/contrib/query/common/localizedConstants.ts diff --git a/src/sql/workbench/parts/query/common/messagePanelState.ts b/src/sql/workbench/contrib/query/common/messagePanelState.ts similarity index 100% rename from src/sql/workbench/parts/query/common/messagePanelState.ts rename to src/sql/workbench/contrib/query/common/messagePanelState.ts diff --git a/src/sql/workbench/parts/query/common/modelViewTab/modelViewState.ts b/src/sql/workbench/contrib/query/common/modelViewTab/modelViewState.ts similarity index 100% rename from src/sql/workbench/parts/query/common/modelViewTab/modelViewState.ts rename to src/sql/workbench/contrib/query/common/modelViewTab/modelViewState.ts diff --git a/src/sql/workbench/parts/query/common/queryContext.ts b/src/sql/workbench/contrib/query/common/queryContext.ts similarity index 100% rename from src/sql/workbench/parts/query/common/queryContext.ts rename to src/sql/workbench/contrib/query/common/queryContext.ts diff --git a/src/sql/workbench/parts/query/common/queryInput.ts b/src/sql/workbench/contrib/query/common/queryInput.ts similarity index 99% rename from src/sql/workbench/parts/query/common/queryInput.ts rename to src/sql/workbench/contrib/query/common/queryInput.ts index f047365f9d..b4d71e0b11 100644 --- a/src/sql/workbench/parts/query/common/queryInput.ts +++ b/src/sql/workbench/contrib/query/common/queryInput.ts @@ -13,7 +13,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { IFileService } from 'vs/platform/files/common/files'; import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; -import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { ISelectionData, ExecutionPlanOptions } from 'azdata'; diff --git a/src/sql/workbench/parts/query/common/queryResultsInput.ts b/src/sql/workbench/contrib/query/common/queryResultsInput.ts similarity index 81% rename from src/sql/workbench/parts/query/common/queryResultsInput.ts rename to src/sql/workbench/contrib/query/common/queryResultsInput.ts index fc93fd2261..48f5fb3a09 100644 --- a/src/sql/workbench/parts/query/common/queryResultsInput.ts +++ b/src/sql/workbench/contrib/query/common/queryResultsInput.ts @@ -6,12 +6,12 @@ import { localize } from 'vs/nls'; import { EditorInput } from 'vs/workbench/common/editor'; -import { TopOperationsState } from 'sql/workbench/parts/queryPlan/common/topOperationsState'; -import { ChartState } from 'sql/workbench/parts/charts/common/interfaces'; -import { QueryPlanState } from 'sql/workbench/parts/queryPlan/common/queryPlanState'; -import { MessagePanelState } from 'sql/workbench/parts/query/common/messagePanelState'; -import { GridPanelState } from 'sql/workbench/parts/query/common/gridPanelState'; -import { QueryModelViewState } from 'sql/workbench/parts/query/common/modelViewTab/modelViewState'; +import { TopOperationsState } from 'sql/workbench/contrib/queryPlan/common/topOperationsState'; +import { ChartState } from 'sql/workbench/contrib/charts/common/interfaces'; +import { QueryPlanState } from 'sql/workbench/contrib/queryPlan/common/queryPlanState'; +import { MessagePanelState } from 'sql/workbench/contrib/query/common/messagePanelState'; +import { GridPanelState } from 'sql/workbench/contrib/query/common/gridPanelState'; +import { QueryModelViewState } from 'sql/workbench/contrib/query/common/modelViewTab/modelViewState'; export class ResultsViewState { public readonly gridPanelState: GridPanelState = new GridPanelState(); diff --git a/src/sql/workbench/parts/query/common/resultSerializer.ts b/src/sql/workbench/contrib/query/common/resultSerializer.ts similarity index 98% rename from src/sql/workbench/parts/query/common/resultSerializer.ts rename to src/sql/workbench/contrib/query/common/resultSerializer.ts index ba8b0d164a..6d33e31ef2 100644 --- a/src/sql/workbench/parts/query/common/resultSerializer.ts +++ b/src/sql/workbench/contrib/query/common/resultSerializer.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as ConnectionConstants from 'sql/platform/connection/common/constants'; -import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants'; +import * as LocalizedConstants from 'sql/workbench/contrib/query/common/localizedConstants'; import { SaveResultsRequestParams } from 'azdata'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { ISaveRequest, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; +import { ISaveRequest, SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/sql/workbench/parts/query/common/resultsGridContribution.ts b/src/sql/workbench/contrib/query/common/resultsGridContribution.ts similarity index 100% rename from src/sql/workbench/parts/query/common/resultsGridContribution.ts rename to src/sql/workbench/contrib/query/common/resultsGridContribution.ts diff --git a/src/sql/workbench/parts/query/test/browser/queryActions.test.ts b/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts similarity index 99% rename from src/sql/workbench/parts/query/test/browser/queryActions.test.ts rename to src/sql/workbench/contrib/query/test/browser/queryActions.test.ts index ad5f78da6b..b759e96264 100644 --- a/src/sql/workbench/parts/query/test/browser/queryActions.test.ts +++ b/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts @@ -18,9 +18,9 @@ import { ConnectionDialogService } from 'sql/workbench/services/connection/brows import { RunQueryAction, CancelQueryAction, ListDatabasesActionItem, DisconnectDatabaseAction, ConnectDatabaseAction, QueryTaskbarAction -} from 'sql/workbench/parts/query/browser/queryActions'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; -import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; +} from 'sql/workbench/contrib/query/browser/queryActions'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; +import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; import { QueryModelService } from 'sql/platform/query/common/queryModelService'; import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/query/test/browser/queryEditor.test.ts b/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts similarity index 98% rename from src/sql/workbench/parts/query/test/browser/queryEditor.test.ts rename to src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts index e71e478455..60dd0f0a4d 100644 --- a/src/sql/workbench/parts/query/test/browser/queryEditor.test.ts +++ b/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts @@ -9,12 +9,12 @@ import { URI } from 'vs/base/common/uri'; import { Memento } from 'vs/workbench/common/memento'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; +import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; import { QueryModelService } from 'sql/platform/query/common/queryModelService'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; -import { RunQueryAction, ListDatabasesActionItem } from 'sql/workbench/parts/query/browser/queryActions'; +import { RunQueryAction, ListDatabasesActionItem } from 'sql/workbench/contrib/query/browser/queryActions'; import { EditorDescriptorService } from 'sql/workbench/services/queryEditor/browser/editorDescriptorService'; import * as TypeMoq from 'typemoq'; diff --git a/src/sql/workbench/parts/queryHistory/browser/media/queryHistoryPanel.css b/src/sql/workbench/contrib/queryHistory/browser/media/queryHistoryPanel.css similarity index 100% rename from src/sql/workbench/parts/queryHistory/browser/media/queryHistoryPanel.css rename to src/sql/workbench/contrib/queryHistory/browser/media/queryHistoryPanel.css diff --git a/src/sql/workbench/parts/queryHistory/browser/media/status_error.svg b/src/sql/workbench/contrib/queryHistory/browser/media/status_error.svg similarity index 100% rename from src/sql/workbench/parts/queryHistory/browser/media/status_error.svg rename to src/sql/workbench/contrib/queryHistory/browser/media/status_error.svg diff --git a/src/sql/workbench/parts/queryHistory/browser/media/status_success.svg b/src/sql/workbench/contrib/queryHistory/browser/media/status_success.svg similarity index 100% rename from src/sql/workbench/parts/queryHistory/browser/media/status_success.svg rename to src/sql/workbench/contrib/queryHistory/browser/media/status_success.svg diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryActionProvider.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActionProvider.ts similarity index 94% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryActionProvider.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryActionProvider.ts index ff1c1ad753..399a4ff40b 100644 --- a/src/sql/workbench/parts/queryHistory/browser/queryHistoryActionProvider.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActionProvider.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DeleteAction, OpenQueryAction, RunQueryAction, ClearHistoryAction, ToggleQueryHistoryCaptureAction } from 'sql/workbench/parts/queryHistory/browser/queryHistoryActions'; +import { DeleteAction, OpenQueryAction, RunQueryAction, ClearHistoryAction, ToggleQueryHistoryCaptureAction } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryActions'; 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 { QueryHistoryNode } from 'sql/workbench/parts/queryHistory/browser/queryHistoryNode'; +import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode'; /** * Provides query history actions diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryActions.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts similarity index 94% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryActions.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts index 125918c378..b54d7165bc 100644 --- a/src/sql/workbench/parts/queryHistory/browser/queryHistoryActions.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ -import { QUERY_HISTORY_PANEL_ID } from 'sql/workbench/parts/queryHistory/common/constants'; +import { QUERY_HISTORY_PANEL_ID } from 'sql/workbench/contrib/queryHistory/common/constants'; import { RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { Action } from 'vs/base/common/actions'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; @@ -12,9 +12,9 @@ import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { TogglePanelAction } from 'vs/workbench/browser/panel'; import { localize } from 'vs/nls'; import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService'; -import { QueryHistoryNode } from 'sql/workbench/parts/queryHistory/browser/queryHistoryNode'; +import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { openNewQuery } from 'sql/workbench/parts/query/browser/queryActions'; +import { openNewQuery } from 'sql/workbench/contrib/query/browser/queryActions'; import { ICommandService } from 'vs/platform/commands/common/commands'; export class ToggleQueryHistoryAction extends TogglePanelAction { diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryController.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryController.ts similarity index 95% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryController.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryController.ts index 11b0e65795..e8747b6b6e 100644 --- a/src/sql/workbench/parts/queryHistory/browser/queryHistoryController.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryController.ts @@ -9,7 +9,7 @@ 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 { QueryHistoryActionProvider } from 'sql/workbench/parts/queryHistory/browser/queryHistoryActionProvider'; +import { QueryHistoryActionProvider } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryActionProvider'; /** * Extends the tree controller to handle clicks on the tree elements for a Query History node diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryDataSource.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryDataSource.ts similarity index 93% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryDataSource.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryDataSource.ts index dc310580ec..8d1bc0c0f2 100644 --- a/src/sql/workbench/parts/queryHistory/browser/queryHistoryDataSource.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryDataSource.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; -import { QueryHistoryNode } from 'sql/workbench/parts/queryHistory/browser/queryHistoryNode'; +import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode'; /** * Implements the DataSource (that returns a parent/children of an element) for the query history diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryNode.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryNode.ts similarity index 100% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryNode.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryNode.ts diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryPanel.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryPanel.ts similarity index 90% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryPanel.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryPanel.ts index 810c797914..1c9d5290dc 100644 --- a/src/sql/workbench/parts/queryHistory/browser/queryHistoryPanel.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryPanel.ts @@ -8,10 +8,10 @@ import { 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 { QueryHistoryView } from 'sql/workbench/parts/queryHistory/browser/queryHistoryView'; +import { QueryHistoryView } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryView'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { Panel } from 'vs/workbench/browser/panel'; -import { QUERY_HISTORY_PANEL_ID } from 'sql/workbench/parts/queryHistory/common/constants'; +import { QUERY_HISTORY_PANEL_ID } from 'sql/workbench/contrib/queryHistory/common/constants'; import { IAction } from 'vs/base/common/actions'; export class QueryHistoryPanel extends Panel { diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryRenderer.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts similarity index 97% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryRenderer.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts index a23c1a7f8f..af4844012b 100644 --- a/src/sql/workbench/parts/queryHistory/browser/queryHistoryRenderer.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts @@ -8,7 +8,7 @@ import { QueryStatus } from 'sql/platform/queryHistory/common/queryHistoryInfo'; import * as dom from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { QueryHistoryNode } from 'sql/workbench/parts/queryHistory/browser/queryHistoryNode'; +import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode'; const $ = dom.$; diff --git a/src/sql/workbench/parts/queryHistory/browser/queryHistoryView.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts similarity index 88% rename from src/sql/workbench/parts/queryHistory/browser/queryHistoryView.ts rename to src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts index bb2bc25552..38835099dd 100644 --- a/src/sql/workbench/parts/queryHistory/browser/queryHistoryView.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts @@ -13,13 +13,13 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { DefaultFilter, DefaultDragAndDrop, DefaultAccessibilityProvider } from 'vs/base/parts/tree/browser/treeDefaults'; import { localize } from 'vs/nls'; import { hide, $, append, show } from 'vs/base/browser/dom'; -import { QueryHistoryRenderer } from 'sql/workbench/parts/queryHistory/browser/queryHistoryRenderer'; -import { QueryHistoryDataSource } from 'sql/workbench/parts/queryHistory/browser/queryHistoryDataSource'; -import { QueryHistoryController } from 'sql/workbench/parts/queryHistory/browser/queryHistoryController'; -import { QueryHistoryActionProvider } from 'sql/workbench/parts/queryHistory/browser/queryHistoryActionProvider'; -import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { QueryHistoryRenderer } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer'; +import { QueryHistoryDataSource } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryDataSource'; +import { QueryHistoryController } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryController'; +import { QueryHistoryActionProvider } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryActionProvider'; +import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService'; -import { QueryHistoryNode } from 'sql/workbench/parts/queryHistory/browser/queryHistoryNode'; +import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode'; import { QueryHistoryInfo } from 'sql/platform/queryHistory/common/queryHistoryInfo'; import { IAction } from 'vs/base/common/actions'; /** diff --git a/src/sql/workbench/parts/queryHistory/common/constants.ts b/src/sql/workbench/contrib/queryHistory/common/constants.ts similarity index 100% rename from src/sql/workbench/parts/queryHistory/common/constants.ts rename to src/sql/workbench/contrib/queryHistory/common/constants.ts diff --git a/src/sql/workbench/parts/queryHistory/electron-browser/queryHistory.contribution.ts b/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.contribution.ts similarity index 93% rename from src/sql/workbench/parts/queryHistory/electron-browser/queryHistory.contribution.ts rename to src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.contribution.ts index 1e1ff4ecb2..b474791c24 100644 --- a/src/sql/workbench/parts/queryHistory/electron-browser/queryHistory.contribution.ts +++ b/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.contribution.ts @@ -6,6 +6,6 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; -import { QueryHistoryWorkbenchContribution } from 'sql/workbench/parts/queryHistory/electron-browser/queryHistory'; +import { QueryHistoryWorkbenchContribution } from 'sql/workbench/contrib/queryHistory/electron-browser/queryHistory'; Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(QueryHistoryWorkbenchContribution, LifecyclePhase.Restored); diff --git a/src/sql/workbench/parts/queryHistory/electron-browser/queryHistory.ts b/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts similarity index 93% rename from src/sql/workbench/parts/queryHistory/electron-browser/queryHistory.ts rename to src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts index 21f7d58668..02423b794e 100644 --- a/src/sql/workbench/parts/queryHistory/electron-browser/queryHistory.ts +++ b/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts @@ -10,10 +10,10 @@ import { localize } from 'vs/nls'; import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { Registry } from 'vs/platform/registry/common/platform'; -import { QueryHistoryPanel } from 'sql/workbench/parts/queryHistory/browser/queryHistoryPanel'; +import { QueryHistoryPanel } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryPanel'; import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel'; -import { QUERY_HISTORY_PANEL_ID } from 'sql/workbench/parts/queryHistory/common/constants'; -import { ToggleQueryHistoryAction } from 'sql/workbench/parts/queryHistory/browser/queryHistoryActions'; +import { QUERY_HISTORY_PANEL_ID } from 'sql/workbench/contrib/queryHistory/common/constants'; +import { ToggleQueryHistoryAction } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryActions'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IConfigurationRegistry, ConfigurationScope, Extensions } from 'vs/platform/configuration/common/configurationRegistry'; diff --git a/src/sql/workbench/parts/queryPlan/browser/media/qp.css b/src/sql/workbench/contrib/queryPlan/browser/media/qp.css similarity index 100% rename from src/sql/workbench/parts/queryPlan/browser/media/qp.css rename to src/sql/workbench/contrib/queryPlan/browser/media/qp.css diff --git a/src/sql/workbench/parts/queryPlan/browser/media/qp_icons.png b/src/sql/workbench/contrib/queryPlan/browser/media/qp_icons.png similarity index 100% rename from src/sql/workbench/parts/queryPlan/browser/media/qp_icons.png rename to src/sql/workbench/contrib/queryPlan/browser/media/qp_icons.png diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlan.component.ts b/src/sql/workbench/contrib/queryPlan/browser/queryPlan.component.ts similarity index 100% rename from src/sql/workbench/parts/queryPlan/browser/queryPlan.component.ts rename to src/sql/workbench/contrib/queryPlan/browser/queryPlan.component.ts diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlan.contribution.ts b/src/sql/workbench/contrib/queryPlan/browser/queryPlan.contribution.ts similarity index 82% rename from src/sql/workbench/parts/queryPlan/browser/queryPlan.contribution.ts rename to src/sql/workbench/contrib/queryPlan/browser/queryPlan.contribution.ts index e498ed8d90..5c326837dd 100644 --- a/src/sql/workbench/parts/queryPlan/browser/queryPlan.contribution.ts +++ b/src/sql/workbench/contrib/queryPlan/browser/queryPlan.contribution.ts @@ -3,11 +3,11 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; +import { QueryPlanInput } from 'sql/workbench/contrib/queryPlan/common/queryPlanInput'; import { EditorDescriptor, IEditorRegistry, Extensions } from 'vs/workbench/browser/editor'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { Registry } from 'vs/platform/registry/common/platform'; -import { QueryPlanEditor } from 'sql/workbench/parts/queryPlan/browser/queryPlanEditor'; +import { QueryPlanEditor } from 'sql/workbench/contrib/queryPlan/browser/queryPlanEditor'; // Query Plan editor registration diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlan.module.ts b/src/sql/workbench/contrib/queryPlan/browser/queryPlan.module.ts similarity index 94% rename from src/sql/workbench/parts/queryPlan/browser/queryPlan.module.ts rename to src/sql/workbench/contrib/queryPlan/browser/queryPlan.module.ts index b0204b81b2..cd9100834d 100644 --- a/src/sql/workbench/parts/queryPlan/browser/queryPlan.module.ts +++ b/src/sql/workbench/contrib/queryPlan/browser/queryPlan.module.ts @@ -8,7 +8,7 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; -import { QueryPlanComponent } from 'sql/workbench/parts/queryPlan/browser/queryPlan.component'; +import { QueryPlanComponent } from 'sql/workbench/contrib/queryPlan/browser/queryPlan.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlan.ts b/src/sql/workbench/contrib/queryPlan/browser/queryPlan.ts similarity index 96% rename from src/sql/workbench/parts/queryPlan/browser/queryPlan.ts rename to src/sql/workbench/contrib/queryPlan/browser/queryPlan.ts index c40fcfac5b..de95124817 100644 --- a/src/sql/workbench/parts/queryPlan/browser/queryPlan.ts +++ b/src/sql/workbench/contrib/queryPlan/browser/queryPlan.ts @@ -10,7 +10,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 } from 'vs/base/common/lifecycle'; -import { QueryPlanState } from 'sql/workbench/parts/queryPlan/common/queryPlanState'; +import { QueryPlanState } from 'sql/workbench/contrib/queryPlan/common/queryPlanState'; export class QueryPlanTab implements IPanelTab { public readonly title = localize('queryPlanTitle', "Query Plan"); diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlanEditor.ts b/src/sql/workbench/contrib/queryPlan/browser/queryPlanEditor.ts similarity index 93% rename from src/sql/workbench/parts/queryPlan/browser/queryPlanEditor.ts rename to src/sql/workbench/contrib/queryPlan/browser/queryPlanEditor.ts index 8f537ecb5e..06e046ad60 100644 --- a/src/sql/workbench/parts/queryPlan/browser/queryPlanEditor.ts +++ b/src/sql/workbench/contrib/queryPlan/browser/queryPlanEditor.ts @@ -9,11 +9,11 @@ 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/workbench/parts/queryPlan/common/queryPlanInput'; -import { QueryPlanModule } from 'sql/workbench/parts/queryPlan/browser/queryPlan.module'; +import { QueryPlanInput } from 'sql/workbench/contrib/queryPlan/common/queryPlanInput'; +import { QueryPlanModule } from 'sql/workbench/contrib/queryPlan/browser/queryPlan.module'; import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { IQueryPlanParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; -import { QUERYPLAN_SELECTOR } from 'sql/workbench/parts/queryPlan/browser/queryPlan.component'; +import { QUERYPLAN_SELECTOR } from 'sql/workbench/contrib/queryPlan/browser/queryPlan.component'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/workbench/parts/queryPlan/browser/topOperations.ts b/src/sql/workbench/contrib/queryPlan/browser/topOperations.ts similarity index 96% rename from src/sql/workbench/parts/queryPlan/browser/topOperations.ts rename to src/sql/workbench/contrib/queryPlan/browser/topOperations.ts index 2910dd5c25..a8f27e8aee 100644 --- a/src/sql/workbench/parts/queryPlan/browser/topOperations.ts +++ b/src/sql/workbench/contrib/queryPlan/browser/topOperations.ts @@ -8,13 +8,13 @@ import { localize } from 'vs/nls'; import { Disposable } from 'vs/base/common/lifecycle'; import { Table } from 'sql/base/browser/ui/table/table'; -import { PlanXmlParser } from 'sql/workbench/parts/queryPlan/common/planXmlParser'; +import { PlanXmlParser } from 'sql/workbench/contrib/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'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import { TopOperationsState } from 'sql/workbench/parts/queryPlan/common/topOperationsState'; +import { TopOperationsState } from 'sql/workbench/contrib/queryPlan/common/topOperationsState'; const topOperationColumns: Array> = [ { name: localize('topOperations.operation', "Operation"), field: 'operation', sortable: true }, diff --git a/src/sql/workbench/parts/queryPlan/common/planXmlParser.ts b/src/sql/workbench/contrib/queryPlan/common/planXmlParser.ts similarity index 100% rename from src/sql/workbench/parts/queryPlan/common/planXmlParser.ts rename to src/sql/workbench/contrib/queryPlan/common/planXmlParser.ts diff --git a/src/sql/workbench/parts/queryPlan/common/queryPlanInput.ts b/src/sql/workbench/contrib/queryPlan/common/queryPlanInput.ts similarity index 100% rename from src/sql/workbench/parts/queryPlan/common/queryPlanInput.ts rename to src/sql/workbench/contrib/queryPlan/common/queryPlanInput.ts diff --git a/src/sql/workbench/parts/queryPlan/common/queryPlanState.ts b/src/sql/workbench/contrib/queryPlan/common/queryPlanState.ts similarity index 100% rename from src/sql/workbench/parts/queryPlan/common/queryPlanState.ts rename to src/sql/workbench/contrib/queryPlan/common/queryPlanState.ts diff --git a/src/sql/workbench/parts/queryPlan/common/topOperationsState.ts b/src/sql/workbench/contrib/queryPlan/common/topOperationsState.ts similarity index 100% rename from src/sql/workbench/parts/queryPlan/common/topOperationsState.ts rename to src/sql/workbench/contrib/queryPlan/common/topOperationsState.ts diff --git a/src/sql/workbench/parts/restore/browser/media/restoreDialog.css b/src/sql/workbench/contrib/restore/browser/media/restoreDialog.css similarity index 100% rename from src/sql/workbench/parts/restore/browser/media/restoreDialog.css rename to src/sql/workbench/contrib/restore/browser/media/restoreDialog.css diff --git a/src/sql/workbench/parts/restore/browser/restore.contribution.ts b/src/sql/workbench/contrib/restore/browser/restore.contribution.ts similarity index 80% rename from src/sql/workbench/parts/restore/browser/restore.contribution.ts rename to src/sql/workbench/contrib/restore/browser/restore.contribution.ts index 307fbb48fa..584004cde4 100644 --- a/src/sql/workbench/parts/restore/browser/restore.contribution.ts +++ b/src/sql/workbench/contrib/restore/browser/restore.contribution.ts @@ -8,16 +8,16 @@ import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { localize } from 'vs/nls'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; -import { RestoreAction } from 'sql/workbench/parts/restore/browser/restoreActions'; -import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; -import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; +import { RestoreAction } from 'sql/workbench/contrib/restore/browser/restoreActions'; +import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; +import { ObjectExplorerActionsContext } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; import { ManageActionContext } from 'sql/workbench/browser/actions'; -import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; -import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey'; +import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext'; +import { ServerInfoContextKey } from 'sql/workbench/contrib/connection/common/serverInfoContextKey'; import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes'; new RestoreAction().registerTask(); diff --git a/src/sql/workbench/parts/restore/browser/restoreActions.ts b/src/sql/workbench/contrib/restore/browser/restoreActions.ts similarity index 100% rename from src/sql/workbench/parts/restore/browser/restoreActions.ts rename to src/sql/workbench/contrib/restore/browser/restoreActions.ts diff --git a/src/sql/workbench/parts/restore/browser/restoreDialog.ts b/src/sql/workbench/contrib/restore/browser/restoreDialog.ts similarity index 99% rename from src/sql/workbench/parts/restore/browser/restoreDialog.ts rename to src/sql/workbench/contrib/restore/browser/restoreDialog.ts index e2d36b27be..67d55f18d6 100644 --- a/src/sql/workbench/parts/restore/browser/restoreDialog.ts +++ b/src/sql/workbench/contrib/restore/browser/restoreDialog.ts @@ -32,8 +32,8 @@ import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import * as BackupConstants from 'sql/workbench/parts/backup/common/constants'; -import { RestoreViewModel, RestoreOptionParam, SouceDatabaseNamesParam } from 'sql/workbench/parts/restore/browser/restoreViewModel'; +import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants'; +import { RestoreViewModel, RestoreOptionParam, SouceDatabaseNamesParam } from 'sql/workbench/contrib/restore/browser/restoreViewModel'; import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants'; import { Dropdown } from 'sql/base/parts/editableDropdown/browser/dropdown'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; diff --git a/src/sql/workbench/parts/restore/browser/restoreViewModel.ts b/src/sql/workbench/contrib/restore/browser/restoreViewModel.ts similarity index 100% rename from src/sql/workbench/parts/restore/browser/restoreViewModel.ts rename to src/sql/workbench/contrib/restore/browser/restoreViewModel.ts diff --git a/src/sql/workbench/parts/restore/test/browser/restoreViewModel.test.ts b/src/sql/workbench/contrib/restore/test/browser/restoreViewModel.test.ts similarity index 98% rename from src/sql/workbench/parts/restore/test/browser/restoreViewModel.test.ts rename to src/sql/workbench/contrib/restore/test/browser/restoreViewModel.test.ts index 3b9fec6fe0..490570e535 100644 --- a/src/sql/workbench/parts/restore/test/browser/restoreViewModel.test.ts +++ b/src/sql/workbench/contrib/restore/test/browser/restoreViewModel.test.ts @@ -5,7 +5,7 @@ import * as azdata from 'azdata'; import * as assert from 'assert'; -import { RestoreViewModel } from 'sql/workbench/parts/restore/browser/restoreViewModel'; +import { RestoreViewModel } from 'sql/workbench/contrib/restore/browser/restoreViewModel'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; suite('Restore Dialog view model tests', () => { @@ -262,4 +262,4 @@ suite('Restore Dialog view model tests', () => { assert.equal(false, viewModel.readHeaderFromMedia); assert.equal('', viewModel.sourceDatabaseName); }); -}); \ No newline at end of file +}); diff --git a/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts b/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts similarity index 95% rename from src/sql/workbench/parts/scripting/browser/scripting.contribution.ts rename to src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts index b114036dad..1f0642c524 100644 --- a/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts +++ b/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts @@ -4,16 +4,16 @@ *--------------------------------------------------------------------------------------------*/ import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; -import * as commands from 'sql/workbench/parts/scripting/browser/scriptingActions'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; +import * as commands from 'sql/workbench/contrib/scripting/browser/scriptingActions'; +import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { localize } from 'vs/nls'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; +import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; +import { ItemContextKey } from 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerTreeContext'; import { EditDataAction } from 'sql/workbench/browser/scriptingActions'; import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes'; diff --git a/src/sql/workbench/parts/scripting/browser/scriptingActions.ts b/src/sql/workbench/contrib/scripting/browser/scriptingActions.ts similarity index 97% rename from src/sql/workbench/parts/scripting/browser/scriptingActions.ts rename to src/sql/workbench/contrib/scripting/browser/scriptingActions.ts index 443e1bde44..958e638f7f 100644 --- a/src/sql/workbench/parts/scripting/browser/scriptingActions.ts +++ b/src/sql/workbench/contrib/scripting/browser/scriptingActions.ts @@ -8,21 +8,21 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress'; import { BaseActionContext } from 'sql/workbench/browser/actions'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ScriptCreateAction, ScriptDeleteAction, ScriptSelectAction, ScriptExecuteAction, ScriptAlterAction, EditDataAction } from 'sql/workbench/browser/scriptingActions'; -import { ObjectExplorerActionsContext, getTreeNode } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; +import { ObjectExplorerActionsContext, getTreeNode } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; -import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeSelectionHandler } from 'sql/workbench/contrib/objectExplorer/browser/treeSelectionHandler'; +import { TreeUpdateUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import Severity from 'vs/base/common/severity'; -import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; -import { VIEWLET_ID } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet'; +import { TreeNode } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; +import { VIEWLET_ID } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet'; //#region -- Data Explorer export const SCRIPT_AS_CREATE_COMMAND_ID = 'dataExplorer.scriptAsCreate'; diff --git a/src/sql/workbench/parts/tasks/browser/media/error.svg b/src/sql/workbench/contrib/tasks/browser/media/error.svg similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/error.svg rename to src/sql/workbench/contrib/tasks/browser/media/error.svg diff --git a/src/sql/workbench/parts/tasks/browser/media/loading.svg b/src/sql/workbench/contrib/tasks/browser/media/loading.svg similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/loading.svg rename to src/sql/workbench/contrib/tasks/browser/media/loading.svg diff --git a/src/sql/workbench/parts/tasks/browser/media/loading_inverse.svg b/src/sql/workbench/contrib/tasks/browser/media/loading_inverse.svg similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/loading_inverse.svg rename to src/sql/workbench/contrib/tasks/browser/media/loading_inverse.svg diff --git a/src/sql/workbench/parts/tasks/browser/media/status_cancelled.svg b/src/sql/workbench/contrib/tasks/browser/media/status_cancelled.svg similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/status_cancelled.svg rename to src/sql/workbench/contrib/tasks/browser/media/status_cancelled.svg diff --git a/src/sql/workbench/parts/tasks/browser/media/status_queuedtask.svg b/src/sql/workbench/contrib/tasks/browser/media/status_queuedtask.svg similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/status_queuedtask.svg rename to src/sql/workbench/contrib/tasks/browser/media/status_queuedtask.svg diff --git a/src/sql/workbench/parts/tasks/browser/media/status_queuedtask_inverse.svg b/src/sql/workbench/contrib/tasks/browser/media/status_queuedtask_inverse.svg similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/status_queuedtask_inverse.svg rename to src/sql/workbench/contrib/tasks/browser/media/status_queuedtask_inverse.svg diff --git a/src/sql/workbench/parts/tasks/browser/media/status_success.svg b/src/sql/workbench/contrib/tasks/browser/media/status_success.svg similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/status_success.svg rename to src/sql/workbench/contrib/tasks/browser/media/status_success.svg diff --git a/src/sql/workbench/parts/tasks/browser/media/tasksPanel.css b/src/sql/workbench/contrib/tasks/browser/media/tasksPanel.css similarity index 100% rename from src/sql/workbench/parts/tasks/browser/media/tasksPanel.css rename to src/sql/workbench/contrib/tasks/browser/media/tasksPanel.css diff --git a/src/sql/workbench/parts/tasks/browser/tasks.contribution.ts b/src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts similarity index 93% rename from src/sql/workbench/parts/tasks/browser/tasks.contribution.ts rename to src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts index 0558aae0eb..300476a166 100644 --- a/src/sql/workbench/parts/tasks/browser/tasks.contribution.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts @@ -8,16 +8,16 @@ import { localize } from 'vs/nls'; import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; import { Registry } from 'vs/platform/registry/common/platform'; -import { TasksPanel } from 'sql/workbench/parts/tasks/browser/tasksPanel'; +import { TasksPanel } from 'sql/workbench/contrib/tasks/browser/tasksPanel'; import * as lifecycle from 'vs/base/common/lifecycle'; import * as ext from 'vs/workbench/common/contributions'; import { ITaskService } from 'sql/platform/tasks/common/tasksService'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel'; -import { TASKS_PANEL_ID } from 'sql/workbench/parts/tasks/common/tasks'; +import { TASKS_PANEL_ID } from 'sql/workbench/contrib/tasks/common/tasks'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; -import { ToggleTasksAction } from 'sql/workbench/parts/tasks/browser/tasksActions'; +import { ToggleTasksAction } from 'sql/workbench/contrib/tasks/browser/tasksActions'; export class StatusUpdater extends lifecycle.Disposable implements ext.IWorkbenchContribution { static ID = 'data.taskhistory.statusUpdater'; diff --git a/src/sql/workbench/parts/tasks/browser/tasksActionProvider.ts b/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts similarity index 95% rename from src/sql/workbench/parts/tasks/browser/tasksActionProvider.ts rename to src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts index 851ac25aeb..612d37d329 100644 --- a/src/sql/workbench/parts/tasks/browser/tasksActionProvider.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts @@ -8,7 +8,7 @@ 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/platform/tasks/common/tasksNode'; -import { CancelAction, ScriptAction } from 'sql/workbench/parts/tasks/common/tasksAction'; +import { CancelAction, ScriptAction } from 'sql/workbench/contrib/tasks/common/tasksAction'; /** * Provides actions for the history tasks diff --git a/src/sql/workbench/parts/tasks/browser/tasksActions.ts b/src/sql/workbench/contrib/tasks/browser/tasksActions.ts similarity index 93% rename from src/sql/workbench/parts/tasks/browser/tasksActions.ts rename to src/sql/workbench/contrib/tasks/browser/tasksActions.ts index ee39a7694d..b8edee2839 100644 --- a/src/sql/workbench/parts/tasks/browser/tasksActions.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksActions.ts @@ -7,7 +7,7 @@ import { localize } from 'vs/nls'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { TogglePanelAction } from 'vs/workbench/browser/panel'; -import { TASKS_PANEL_ID } from 'sql/workbench/parts/tasks/common/tasks'; +import { TASKS_PANEL_ID } from 'sql/workbench/contrib/tasks/common/tasks'; export class ToggleTasksAction extends TogglePanelAction { diff --git a/src/sql/workbench/parts/tasks/browser/tasksController.ts b/src/sql/workbench/contrib/tasks/browser/tasksController.ts similarity index 96% rename from src/sql/workbench/parts/tasks/browser/tasksController.ts rename to src/sql/workbench/contrib/tasks/browser/tasksController.ts index 83635f6b84..99bf678e59 100644 --- a/src/sql/workbench/parts/tasks/browser/tasksController.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksController.ts @@ -9,7 +9,7 @@ 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/workbench/parts/tasks/browser/tasksActionProvider'; +import { TaskHistoryActionProvider } from 'sql/workbench/contrib/tasks/browser/tasksActionProvider'; /** * Extends the tree controller to handle clicks on the tree elements diff --git a/src/sql/workbench/parts/tasks/browser/tasksDataSource.ts b/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts similarity index 100% rename from src/sql/workbench/parts/tasks/browser/tasksDataSource.ts rename to src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts diff --git a/src/sql/workbench/parts/tasks/browser/tasksPanel.ts b/src/sql/workbench/contrib/tasks/browser/tasksPanel.ts similarity index 91% rename from src/sql/workbench/parts/tasks/browser/tasksPanel.ts rename to src/sql/workbench/contrib/tasks/browser/tasksPanel.ts index f599ea34bb..970af5e25b 100644 --- a/src/sql/workbench/parts/tasks/browser/tasksPanel.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksPanel.ts @@ -8,10 +8,10 @@ import { 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 { TaskHistoryView } from 'sql/workbench/parts/tasks/browser/tasksView'; +import { TaskHistoryView } from 'sql/workbench/contrib/tasks/browser/tasksView'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { Panel } from 'vs/workbench/browser/panel'; -import { TASKS_PANEL_ID } from 'sql/workbench/parts/tasks/common/tasks'; +import { TASKS_PANEL_ID } from 'sql/workbench/contrib/tasks/common/tasks'; export class TasksPanel extends Panel { diff --git a/src/sql/workbench/parts/tasks/browser/tasksRenderer.ts b/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts similarity index 100% rename from src/sql/workbench/parts/tasks/browser/tasksRenderer.ts rename to src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts diff --git a/src/sql/workbench/parts/tasks/browser/tasksView.ts b/src/sql/workbench/contrib/tasks/browser/tasksView.ts similarity index 92% rename from src/sql/workbench/parts/tasks/browser/tasksView.ts rename to src/sql/workbench/contrib/tasks/browser/tasksView.ts index f75f524a1b..f345121c2d 100644 --- a/src/sql/workbench/parts/tasks/browser/tasksView.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksView.ts @@ -15,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/workbench/parts/tasks/browser/tasksRenderer'; -import { TaskHistoryDataSource } from 'sql/workbench/parts/tasks/browser/tasksDataSource'; -import { TaskHistoryController } from 'sql/workbench/parts/tasks/browser/tasksController'; -import { TaskHistoryActionProvider } from 'sql/workbench/parts/tasks/browser/tasksActionProvider'; +import { TaskHistoryRenderer } from 'sql/workbench/contrib/tasks/browser/tasksRenderer'; +import { TaskHistoryDataSource } from 'sql/workbench/contrib/tasks/browser/tasksDataSource'; +import { TaskHistoryController } from 'sql/workbench/contrib/tasks/browser/tasksController'; +import { TaskHistoryActionProvider } from 'sql/workbench/contrib/tasks/browser/tasksActionProvider'; import { ITaskService } from 'sql/platform/tasks/common/tasksService'; import { TaskNode, TaskStatus } from 'sql/platform/tasks/common/tasksNode'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; /** * TaskHistoryView implements the dynamic tree view. diff --git a/src/sql/workbench/parts/tasks/common/tasks.ts b/src/sql/workbench/contrib/tasks/common/tasks.ts similarity index 100% rename from src/sql/workbench/parts/tasks/common/tasks.ts rename to src/sql/workbench/contrib/tasks/common/tasks.ts diff --git a/src/sql/workbench/parts/tasks/common/tasksAction.ts b/src/sql/workbench/contrib/tasks/common/tasksAction.ts similarity index 100% rename from src/sql/workbench/parts/tasks/common/tasksAction.ts rename to src/sql/workbench/contrib/tasks/common/tasksAction.ts diff --git a/src/sql/workbench/parts/telemetry/common/telemetry.contribution.ts b/src/sql/workbench/contrib/telemetry/common/telemetry.contribution.ts similarity index 100% rename from src/sql/workbench/parts/telemetry/common/telemetry.contribution.ts rename to src/sql/workbench/contrib/telemetry/common/telemetry.contribution.ts diff --git a/src/sql/workbench/parts/webview/browser/webViewDialog.ts b/src/sql/workbench/contrib/webview/browser/webViewDialog.ts similarity index 100% rename from src/sql/workbench/parts/webview/browser/webViewDialog.ts rename to src/sql/workbench/contrib/webview/browser/webViewDialog.ts diff --git a/src/sql/workbench/parts/welcome/gettingStarted/browser/gettingStarted.contribution.ts b/src/sql/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts similarity index 100% rename from src/sql/workbench/parts/welcome/gettingStarted/browser/gettingStarted.contribution.ts rename to src/sql/workbench/contrib/welcome/gettingStarted/browser/gettingStarted.contribution.ts diff --git a/src/sql/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts b/src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts similarity index 100% rename from src/sql/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts rename to src/sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution.ts diff --git a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts index 7b5d665d8e..ae0552f66d 100644 --- a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts +++ b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts @@ -12,8 +12,8 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag import { Memento } from 'vs/workbench/common/memento'; import AccountStore from 'sql/platform/accounts/common/accountStore'; -import { AccountDialogController } from 'sql/workbench/parts/accounts/browser/accountDialogController'; -import { AutoOAuthDialogController } from 'sql/workbench/parts/accounts/browser/autoOAuthDialogController'; +import { AccountDialogController } from 'sql/workbench/contrib/accounts/browser/accountDialogController'; +import { AutoOAuthDialogController } from 'sql/workbench/contrib/accounts/browser/autoOAuthDialogController'; import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes'; import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces'; import { Deferred } from 'sql/base/common/promise'; diff --git a/src/sql/workbench/services/accountManagement/test/browser/accountManagementService.test.ts b/src/sql/workbench/services/accountManagement/test/browser/accountManagementService.test.ts index 7b6c2aef81..aa96935b0c 100644 --- a/src/sql/workbench/services/accountManagement/test/browser/accountManagementService.test.ts +++ b/src/sql/workbench/services/accountManagement/test/browser/accountManagementService.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import AccountStore from 'sql/platform/accounts/common/accountStore'; -import { AccountDialogController } from 'sql/workbench/parts/accounts/browser/accountDialogController'; +import { AccountDialogController } from 'sql/workbench/contrib/accounts/browser/accountDialogController'; import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes'; import { IAccountStore } from 'sql/platform/accounts/common/interfaces'; diff --git a/src/sql/workbench/services/backup/browser/backupUiService.ts b/src/sql/workbench/services/backup/browser/backupUiService.ts index 3e2fa49a28..ff54132668 100644 --- a/src/sql/workbench/services/backup/browser/backupUiService.ts +++ b/src/sql/workbench/services/backup/browser/backupUiService.ts @@ -13,7 +13,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as ConnectionUtils from 'sql/platform/connection/common/utils'; import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { BackupDialog } from 'sql/workbench/parts/backup/browser/backupDialog'; +import { BackupDialog } from 'sql/workbench/contrib/backup/browser/backupDialog'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; diff --git a/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts index c4a337e155..8e17741f1f 100644 --- a/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts +++ b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts @@ -16,7 +16,7 @@ import { IAdminService } from 'sql/workbench/services/admin/common/adminService' import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'azdata'; diff --git a/src/sql/workbench/services/bootstrap/common/bootstrapParams.ts b/src/sql/workbench/services/bootstrap/common/bootstrapParams.ts index e6192dbb1f..50d445f9fc 100644 --- a/src/sql/workbench/services/bootstrap/common/bootstrapParams.ts +++ b/src/sql/workbench/services/bootstrap/common/bootstrapParams.ts @@ -3,10 +3,10 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DataService } from 'sql/workbench/parts/grid/common/dataService'; +import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; +import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; import { Event } from 'vs/base/common/event'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/services/capabilities/common/capabilitiesServiceImpl.ts b/src/sql/workbench/services/capabilities/common/capabilitiesServiceImpl.ts index a8756c184f..1a79f82ae4 100644 --- a/src/sql/workbench/services/capabilities/common/capabilitiesServiceImpl.ts +++ b/src/sql/workbench/services/capabilities/common/capabilitiesServiceImpl.ts @@ -14,7 +14,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import * as azdata from 'azdata'; import { toObject } from 'sql/base/common/map'; -import { IConnectionProviderRegistry, Extensions as ConnectionExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { IConnectionProviderRegistry, Extensions as ConnectionExtensions } from 'sql/workbench/contrib/connection/common/connectionProviderExtension'; import { ICapabilitiesService, ProviderFeatures, clientCapabilities, ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; import { find } from 'vs/base/common/arrays'; import { entries } from 'sql/base/common/collections'; diff --git a/src/sql/workbench/services/connection/browser/connectionController.ts b/src/sql/workbench/services/connection/browser/connectionController.ts index de7faf85fa..5162c9dae8 100644 --- a/src/sql/workbench/services/connection/browser/connectionController.ts +++ b/src/sql/workbench/services/connection/browser/connectionController.ts @@ -5,7 +5,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionComponentCallbacks, IConnectionComponentController, IConnectionValidateResult } from 'sql/workbench/services/connection/browser/connectionDialogService'; -import { AdvancedPropertiesController } from 'sql/workbench/parts/connection/browser/advancedPropertiesController'; +import { AdvancedPropertiesController } from 'sql/workbench/contrib/connection/browser/advancedPropertiesController'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as Constants from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts index 4c08119f8e..7a1bdf9cec 100644 --- a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts @@ -10,14 +10,14 @@ 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/workbench/parts/objectExplorer/browser/treeCreationUtils'; -import { TreeUpdateUtils, IExpandableTree } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { TreeCreationUtils } from 'sql/workbench/contrib/objectExplorer/browser/treeCreationUtils'; +import { TreeUpdateUtils, IExpandableTree } from 'sql/workbench/contrib/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'; -import { SavedConnectionTreeController } from 'sql/workbench/parts/connection/browser/savedConnectionTreeController'; +import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/workbench/contrib/connection/browser/recentConnectionTreeController'; +import { SavedConnectionTreeController } from 'sql/workbench/contrib/connection/browser/savedConnectionTreeController'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { ClearRecentConnectionsAction } from 'sql/workbench/parts/connection/browser/connectionActions'; +import { ClearRecentConnectionsAction } from 'sql/workbench/contrib/connection/browser/connectionActions'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { contrastBorder } from 'vs/platform/theme/common/colorRegistry'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/services/connection/browser/connectionManagementService.ts b/src/sql/workbench/services/connection/browser/connectionManagementService.ts index faa9e5b050..6368578ab6 100644 --- a/src/sql/workbench/services/connection/browser/connectionManagementService.ts +++ b/src/sql/workbench/services/connection/browser/connectionManagementService.ts @@ -15,17 +15,17 @@ import { ConnectionManagementInfo } from 'sql/platform/connection/common/connect import * as Utils from 'sql/platform/connection/common/utils'; import * as Constants from 'sql/platform/connection/common/constants'; import { ICapabilitiesService, ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; -import * as ConnectionContracts from 'sql/workbench/parts/connection/common/connection'; +import * as ConnectionContracts from 'sql/workbench/contrib/connection/common/connection'; import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; -import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput'; -import { ConnectionGlobalStatus } from 'sql/workbench/parts/connection/common/connectionGlobalStatus'; +import { DashboardInput } from 'sql/workbench/contrib/dashboard/browser/dashboardInput'; +import { ConnectionGlobalStatus } from 'sql/workbench/contrib/connection/common/connectionGlobalStatus'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; -import * as QueryConstants from 'sql/workbench/parts/query/common/constants'; +import * as QueryConstants from 'sql/workbench/contrib/query/common/constants'; import { Deferred } from 'sql/base/common/promise'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/contrib/connection/common/connectionProviderExtension'; import { IAccountManagementService, AzureResource } from 'sql/platform/accounts/common/interfaces'; import * as azdata from 'azdata'; diff --git a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts index 360f8bd538..4d6863c133 100644 --- a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; export const INewDashboardTabDialogService = createDecorator('addNewDashboardTabService'); export interface INewDashboardTabDialogService { diff --git a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts index 6bd064dafa..0a133a0b41 100644 --- a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts @@ -22,7 +22,7 @@ import { Modal } from 'sql/workbench/browser/modal/modal'; import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { NewDashboardTabViewModel, IDashboardUITab } from 'sql/workbench/services/dashboard/browser/newDashboardTabViewModel'; -import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; diff --git a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts index 4dc7a58e5f..463523305a 100644 --- a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts @@ -5,7 +5,7 @@ import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; import { NewDashboardTabDialog } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl'; -import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; import { IDashboardUITab } from 'sql/workbench/services/dashboard/browser/newDashboardTabViewModel'; diff --git a/src/sql/workbench/services/dashboard/browser/newDashboardTabViewModel.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabViewModel.ts index afc7e84d70..6f0edd62eb 100644 --- a/src/sql/workbench/services/dashboard/browser/newDashboardTabViewModel.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabViewModel.ts @@ -5,7 +5,7 @@ import { Event, Emitter } from 'vs/base/common/event'; -import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/services/dialog/browser/dialog.module.ts b/src/sql/workbench/services/dialog/browser/dialog.module.ts index ba4aa681e9..e3929faa68 100644 --- a/src/sql/workbench/services/dialog/browser/dialog.module.ts +++ b/src/sql/workbench/services/dialog/browser/dialog.module.ts @@ -15,7 +15,7 @@ import { WizardNavigation } from 'sql/workbench/services/dialog/browser/wizardNa import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/modelComponentWrapper.component'; -import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component'; diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts index 0102e3268b..3d4e5b1822 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/workbench/parts/objectExplorer/browser/treeUpdateUtils'; +import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; /** * Implements tree view for file browser diff --git a/src/sql/workbench/services/notebook/browser/notebookService.ts b/src/sql/workbench/services/notebook/browser/notebookService.ts index fe237b5aed..16fec2cde8 100644 --- a/src/sql/workbench/services/notebook/browser/notebookService.ts +++ b/src/sql/workbench/services/notebook/browser/notebookService.ts @@ -8,13 +8,13 @@ import * as azdata from 'azdata'; import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { URI } from 'vs/base/common/uri'; -import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry'; -import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; +import { RenderMimeRegistry } from 'sql/workbench/contrib/notebook/browser/outputs/registry'; +import { ModelFactory } from 'sql/workbench/contrib/notebook/browser/models/modelFactory'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; +import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { ICellModel, INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; -import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { ICellModel, INotebookModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; +import { NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export const SERVICE_ID = 'notebookService'; diff --git a/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts index df48f34848..1d91b67dac 100644 --- a/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts +++ b/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts @@ -12,8 +12,8 @@ import { INotebookService, INotebookManager, INotebookProvider, DEFAULT_NOTEBOOK_FILETYPE, INotebookEditor, SQL_NOTEBOOK_PROVIDER, OVERRIDE_EDITOR_THEMING_SETTING, INavigationProvider, ILanguageMagic } from 'sql/workbench/services/notebook/browser/notebookService'; -import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry'; -import { standardRendererFactories } from 'sql/workbench/parts/notebook/browser/outputs/factories'; +import { RenderMimeRegistry } from 'sql/workbench/contrib/notebook/browser/outputs/registry'; +import { standardRendererFactories } from 'sql/workbench/contrib/notebook/browser/outputs/factories'; import { Extensions, INotebookProviderRegistry, NotebookProviderRegistration } from 'sql/workbench/services/notebook/common/notebookRegistry'; import { Emitter, Event } from 'vs/base/common/event'; import { Memento } from 'vs/workbench/common/memento'; @@ -26,11 +26,11 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { NotebookEditorVisibleContext } from 'sql/workbench/services/notebook/common/notebookContext'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { NotebookEditor } from 'sql/workbench/parts/notebook/browser/notebookEditor'; +import { NotebookEditor } from 'sql/workbench/contrib/notebook/browser/notebookEditor'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { registerNotebookThemes } from 'sql/workbench/parts/notebook/browser/notebookStyles'; +import { registerNotebookThemes } from 'sql/workbench/contrib/notebook/browser/notebookStyles'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { notebookConstants, ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { notebookConstants, ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { SqlNotebookProvider } from 'sql/workbench/services/notebook/browser/sql/sqlNotebookProvider'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; @@ -40,7 +40,7 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import { Schemas } from 'vs/base/common/network'; import { ILogService } from 'vs/platform/log/common/log'; import { toErrorMessage } from 'vs/base/common/errorMessage'; -import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; +import { NotebookChangeType } from 'sql/workbench/contrib/notebook/common/models/contracts'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { find, firstIndex } from 'vs/base/common/arrays'; diff --git a/src/sql/workbench/services/notebook/browser/sessionManager.ts b/src/sql/workbench/services/notebook/browser/sessionManager.ts index 80d35f3c34..33fc138933 100644 --- a/src/sql/workbench/services/notebook/browser/sessionManager.ts +++ b/src/sql/workbench/services/notebook/browser/sessionManager.ts @@ -5,7 +5,7 @@ import { nb } from 'azdata'; import { localize } from 'vs/nls'; -import { FutureInternal } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { FutureInternal } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; export const noKernel: string = localize('noKernel', "No Kernel"); diff --git a/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts index b8fe1e59e2..279cc14d96 100644 --- a/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts +++ b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts @@ -5,7 +5,7 @@ import { nb, QueryExecuteSubsetResult, IDbColumn, BatchSummary, IResultMessage, ResultSetSummary } from 'azdata'; import { localize } from 'vs/nls'; -import { FutureInternal, notebookConstants } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { FutureInternal, notebookConstants } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import QueryRunner from 'sql/platform/query/common/queryRunner'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -16,7 +16,7 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { escape } from 'sql/base/common/strings'; -import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import * as notebookUtils from 'sql/workbench/contrib/notebook/browser/models/notebookUtils'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/services/notebook/common/localContentManager.ts b/src/sql/workbench/services/notebook/common/localContentManager.ts index 7c5f7a92bb..4b32096ec8 100644 --- a/src/sql/workbench/services/notebook/common/localContentManager.ts +++ b/src/sql/workbench/services/notebook/common/localContentManager.ts @@ -12,10 +12,10 @@ import { URI } from 'vs/base/common/uri'; import { localize } from 'vs/nls'; import { IFileService } from 'vs/platform/files/common/files'; -import { JSONObject } from 'sql/workbench/parts/notebook/common/models/jsonext'; -import { OutputTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { nbversion } from 'sql/workbench/parts/notebook/common/models/notebookConstants'; -import { nbformat } from 'sql/workbench/parts/notebook/common/models/nbformat'; +import { JSONObject } from 'sql/workbench/contrib/notebook/common/models/jsonext'; +import { OutputTypes } from 'sql/workbench/contrib/notebook/common/models/contracts'; +import { nbversion } from 'sql/workbench/contrib/notebook/common/models/notebookConstants'; +import { nbformat } from 'sql/workbench/contrib/notebook/common/models/nbformat'; import { VSBuffer } from 'vs/base/common/buffer'; type MimeBundle = { [key: string]: string | string[] | undefined }; diff --git a/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts b/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts index dd9d970283..83f76759a1 100644 --- a/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts +++ b/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; -import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; @@ -13,7 +13,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeView'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import * as Utils from 'sql/platform/connection/common/utils'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts b/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts index 2824603fef..45bba1d643 100644 --- a/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts +++ b/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts @@ -6,13 +6,13 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; -import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; +import { NodeType } from 'sql/workbench/contrib/objectExplorer/common/nodeType'; +import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/contrib/objectExplorer/common/treeNode'; import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; -import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; +import { ServerTreeView } from 'sql/workbench/contrib/objectExplorer/browser/serverTreeView'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { Event } from 'vs/base/common/event'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/services/profiler/browser/interfaces.ts b/src/sql/workbench/services/profiler/browser/interfaces.ts index 71bfa69bd2..5498bbfa5f 100644 --- a/src/sql/workbench/services/profiler/browser/interfaces.ts +++ b/src/sql/workbench/services/profiler/browser/interfaces.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import * as azdata from 'azdata'; -import { INewProfilerState } from 'sql/workbench/parts/profiler/common/profilerState'; +import { INewProfilerState } from 'sql/workbench/contrib/profiler/common/profilerState'; const PROFILER_SERVICE_ID = 'profilerService'; export const IProfilerService = createDecorator(PROFILER_SERVICE_ID); diff --git a/src/sql/workbench/services/profiler/browser/profilerService.ts b/src/sql/workbench/services/profiler/browser/profilerService.ts index 50c7a690e8..09501df3d6 100644 --- a/src/sql/workbench/services/profiler/browser/profilerService.ts +++ b/src/sql/workbench/services/profiler/browser/profilerService.ts @@ -6,8 +6,8 @@ import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { ProfilerSessionID, IProfilerSession, IProfilerService, IProfilerViewTemplate, IProfilerSessionTemplate, PROFILER_SETTINGS, IProfilerSettings, EngineType, ProfilerFilter, PROFILER_FILTER_SETTINGS } from './interfaces'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; -import { ProfilerColumnEditorDialog } from 'sql/workbench/parts/profiler/browser/profilerColumnEditorDialog'; +import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; +import { ProfilerColumnEditorDialog } from 'sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog'; import * as azdata from 'azdata'; @@ -17,7 +17,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { ICommandService } from 'vs/platform/commands/common/commands'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { Memento } from 'vs/workbench/common/memento'; -import { ProfilerFilterDialog } from 'sql/workbench/parts/profiler/browser/profilerFilterDialog'; +import { ProfilerFilterDialog } from 'sql/workbench/contrib/profiler/browser/profilerFilterDialog'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; class TwoWayMap { diff --git a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts index 5e4be23997..c7d1794ab1 100644 --- a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts +++ b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput'; -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; -import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput'; +import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; +import { EditDataInput } from 'sql/workbench/contrib/editData/browser/editDataInput'; import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/workbench/browser/customInputConverter'; @@ -22,7 +22,7 @@ import paths = require('vs/base/common/extpath'); import { isLinux } from 'vs/base/common/platform'; import { Schemas } from 'vs/base/common/network'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput'; +import { EditDataResultsInput } from 'sql/workbench/contrib/editData/browser/editDataResultsInput'; import { IEditorInput, IEditor } from 'vs/workbench/common/editor'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { ILanguageSelection } from 'vs/editor/common/services/modeService'; diff --git a/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts index ac5f174321..2939099bde 100644 --- a/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts +++ b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts @@ -8,7 +8,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IResourceProviderService, IHandleFirewallRuleResult } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { FirewallRuleDialogController } from 'sql/workbench/parts/accounts/browser/firewallRuleDialogController'; +import { FirewallRuleDialogController } from 'sql/workbench/contrib/accounts/browser/firewallRuleDialogController'; import * as azdata from 'azdata'; import { invalidProvider } from 'sql/base/common/errors'; diff --git a/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts b/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts index bd19b40436..f2f10bd721 100644 --- a/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts +++ b/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts @@ -7,12 +7,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/workbench/parts/objectExplorer/common/serverGroup.contribution'; +import { SERVER_GROUP_CONFIG, SERVER_GROUP_COLORS_CONFIG } from 'sql/workbench/contrib/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/workbench/parts/objectExplorer/browser/serverGroupDialog'; -import { ServerGroupViewModel } from 'sql/workbench/parts/objectExplorer/common/serverGroupViewModel'; +import { ServerGroupDialog } from 'sql/workbench/contrib/objectExplorer/browser/serverGroupDialog'; +import { ServerGroupViewModel } from 'sql/workbench/contrib/objectExplorer/common/serverGroupViewModel'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; export class ServerGroupController implements IServerGroupController { diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index fb4a09678e..564bfb2395 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -45,7 +45,7 @@ import { ILabelService } from 'vs/platform/label/common/label'; // {{SQL CARBON EDIT}} -- Display the editor's tab color import { ICommandService } from 'vs/platform/commands/common/commands'; -import * as QueryConstants from 'sql/workbench/parts/query/common/constants'; +import * as QueryConstants from 'sql/workbench/contrib/query/common/constants'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import { GlobalNewUntitledFileAction } from 'vs/workbench/contrib/files/browser/fileActions'; // {{SQL CARBON EDIT}} -- End diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index aa2e61fc5d..0550c2de42 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/src/vs/workbench/common/editor/editorGroup.ts @@ -14,10 +14,10 @@ import { ResourceMap } from 'vs/base/common/map'; import { coalesce, firstIndex } from 'vs/base/common/arrays'; // {{SQL CARBON EDIT}} -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; import * as CustomInputConverter from 'sql/workbench/browser/customInputConverter'; -import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; +import { NotebookInput } from 'sql/workbench/contrib/notebook/browser/models/notebookInput'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput'; const EditorOpenPositioning = { diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts index 933c3886ac..2f78e35b76 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts @@ -51,7 +51,7 @@ import { isUndefined } from 'vs/base/common/types'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IWebviewService, Webview, KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from 'vs/workbench/contrib/webview/browser/webview'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { renderDashboardContributions } from 'sql/workbench/parts/extensions/browser/contributionRenders'; // {{SQL CARBON EDIT}} +import { renderDashboardContributions } from 'sql/workbench/contrib/extensions/browser/contributionRenders'; // {{SQL CARBON EDIT}} import { generateUuid } from 'vs/base/common/uuid'; import { platform } from 'vs/base/common/process'; import { URI } from 'vs/base/common/uri'; diff --git a/src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts b/src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts index c949dbad2d..f7b5e974a3 100644 --- a/src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts +++ b/src/vs/workbench/contrib/files/browser/editors/fileEditorTracker.ts @@ -30,7 +30,7 @@ import { withNullAsUndefined } from 'vs/base/common/types'; import { EditorActivation } from 'vs/platform/editor/common/editor'; // {{SQL CARBON EDIT}} -import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; +import { QueryInput } from 'sql/workbench/contrib/query/common/queryInput'; export class FileEditorTracker extends Disposable implements IWorkbenchContribution { diff --git a/src/vs/workbench/contrib/files/browser/fileActions.ts b/src/vs/workbench/contrib/files/browser/fileActions.ts index 648dde9b25..332c9ff94f 100644 --- a/src/vs/workbench/contrib/files/browser/fileActions.ts +++ b/src/vs/workbench/contrib/files/browser/fileActions.ts @@ -47,7 +47,7 @@ import { ExplorerItem, NewExplorerItem } from 'vs/workbench/contrib/files/common import { onUnexpectedError, getErrorMessage } from 'vs/base/common/errors'; // {{SQL CARBON EDIT}} -import { openNewQuery } from 'sql/workbench/parts/query/browser/queryActions'; +import { openNewQuery } from 'sql/workbench/contrib/query/browser/queryActions'; export const NEW_FILE_COMMAND_ID = 'explorer.newFile'; export const NEW_FILE_LABEL = nls.localize('newFile', "New File"); diff --git a/src/vs/workbench/contrib/watermark/browser/watermark.ts b/src/vs/workbench/contrib/watermark/browser/watermark.ts index 651a877614..5f00c6693a 100644 --- a/src/vs/workbench/contrib/watermark/browser/watermark.ts +++ b/src/vs/workbench/contrib/watermark/browser/watermark.ts @@ -31,8 +31,8 @@ import { IDimension } from 'vs/platform/layout/browser/layoutService'; import { assertIsDefined } from 'vs/base/common/types'; // {{SQL CARBON EDIT}} -import { NewNotebookAction } from 'sql/workbench/parts/notebook/browser/notebookActions'; -import { OpenDataExplorerViewletAction } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerViewlet'; +import { NewNotebookAction } from 'sql/workbench/contrib/notebook/browser/notebookActions'; +import { OpenDataExplorerViewletAction } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet'; const $ = dom.$; diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index 3c7eefd0d6..89e6637d88 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -145,7 +145,7 @@ import { IResourceProviderService } from 'sql/workbench/services/resourceProvide import { ResourceProviderService } from 'sql/workbench/services/resourceProvider/browser/resourceProviderService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { AdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; -import { OEShimService, IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; +import { OEShimService, IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/objectExplorerViewTreeShim'; import { IObjectExplorerService, ObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; import { AngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingServiceImpl'; @@ -174,8 +174,8 @@ import { IAccountManagementService } from 'sql/platform/accounts/common/interfac import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { ProfilerService } from 'sql/workbench/services/profiler/browser/profilerService'; -import { AccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPickerService'; -import { IAccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPicker'; +import { AccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPickerService'; +import { IAccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPicker'; import { IDashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewService'; import { DashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewServiceImpl'; import { IModelViewService } from 'sql/platform/modelComponents/browser/modelViewService'; @@ -362,78 +362,78 @@ import 'vs/workbench/contrib/userDataSync/browser/userDataSync.contribution'; //#region -- contributions // query -import 'sql/workbench/parts/query/browser/query.contribution'; -import 'sql/workbench/parts/query/common/resultsGridContribution'; +import 'sql/workbench/contrib/query/browser/query.contribution'; +import 'sql/workbench/contrib/query/common/resultsGridContribution'; // data explorer -import 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution'; -import 'sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution'; +import 'sql/workbench/contrib/dataExplorer/browser/dataExplorer.contribution'; +import 'sql/workbench/contrib/dataExplorer/browser/nodeActions.common.contribution'; // {{SQL CARBON EDIT}} // tasks -import 'sql/workbench/parts/tasks/browser/tasks.contribution'; +import 'sql/workbench/contrib/tasks/browser/tasks.contribution'; import 'sql/workbench/browser/actions.contribution'; // telemetry -import 'sql/workbench/parts/telemetry/common/telemetry.contribution'; +import 'sql/workbench/contrib/telemetry/common/telemetry.contribution'; // connection -import 'sql/workbench/parts/connection/browser/connection.contribution'; -import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution'; +import 'sql/workbench/contrib/connection/browser/connection.contribution'; +import 'sql/workbench/contrib/objectExplorer/common/serverGroup.contribution'; // edit data editor -import 'sql/workbench/parts/editData/browser/editData.contribution'; +import 'sql/workbench/contrib/editData/browser/editData.contribution'; // query plan editor -import 'sql/workbench/parts/queryPlan/browser/queryPlan.contribution'; +import 'sql/workbench/contrib/queryPlan/browser/queryPlan.contribution'; //acounts -import 'sql/workbench/parts/accounts/browser/accounts.contribution'; -import 'sql/workbench/parts/accounts/browser/accountManagement.contribution'; +import 'sql/workbench/contrib/accounts/browser/accounts.contribution'; +import 'sql/workbench/contrib/accounts/browser/accountManagement.contribution'; // profiler -import 'sql/workbench/parts/profiler/browser/profiler.contribution'; -import 'sql/workbench/parts/profiler/browser/profilerActions.contribution'; +import 'sql/workbench/contrib/profiler/browser/profiler.contribution'; +import 'sql/workbench/contrib/profiler/browser/profilerActions.contribution'; // dashboard -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/countInsight.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/imageInsight.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/views/tableInsight.contribution'; -import 'sql/workbench/parts/dashboard/browser/dashboard.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.contribution'; -import 'sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.contribution'; -import 'sql/workbench/parts/dashboard/browser/containers/dashboardWebviewContainer.contribution'; -import 'sql/workbench/parts/dashboard/browser/containers/dashboardControlHostContainer.contribution'; -import 'sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.contribution'; -import 'sql/workbench/parts/dashboard/browser/containers/dashboardWidgetContainer.contribution'; -import 'sql/workbench/parts/dashboard/browser/containers/dashboardContainer.contribution'; -import 'sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.contribution'; -import 'sql/workbench/parts/dashboard/browser/containers/dashboardModelViewContainer.contribution'; -import 'sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/barChart.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/doughnutChart.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/horizontalBarChart.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/lineChart.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/pieChart.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/scatterChart.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/types/timeSeriesChart.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.contribution'; +import 'sql/workbench/contrib/dashboard/browser/dashboard.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/insights/insightsWidget.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/explorer/explorerWidget.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution'; +import 'sql/workbench/contrib/dashboard/browser/widgets/webview/webviewWidget.contribution'; +import 'sql/workbench/contrib/dashboard/browser/containers/dashboardWebviewContainer.contribution'; +import 'sql/workbench/contrib/dashboard/browser/containers/dashboardControlHostContainer.contribution'; +import 'sql/workbench/contrib/dashboard/browser/containers/dashboardGridContainer.contribution'; +import 'sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.contribution'; +import 'sql/workbench/contrib/dashboard/browser/containers/dashboardContainer.contribution'; +import 'sql/workbench/contrib/dashboard/browser/containers/dashboardNavSection.contribution'; +import 'sql/workbench/contrib/dashboard/browser/containers/dashboardModelViewContainer.contribution'; +import 'sql/workbench/contrib/dashboard/browser/core/dashboardTab.contribution'; // Model-based Views import 'sql/workbench/browser/modelComponents/components.contribution'; import 'sql/workbench/browser/modelComponents/modelViewEditor.contribution'; // notebooks -import 'sql/workbench/parts/notebook/browser/notebook.contribution'; +import 'sql/workbench/contrib/notebook/browser/notebook.contribution'; // backup -import 'sql/workbench/parts/backup/browser/backup.contribution'; +import 'sql/workbench/contrib/backup/browser/backup.contribution'; //restore -import 'sql/workbench/parts/restore/browser/restore.contribution'; +import 'sql/workbench/contrib/restore/browser/restore.contribution'; // Scripting -import 'sql/workbench/parts/scripting/browser/scripting.contribution'; +import 'sql/workbench/contrib/scripting/browser/scripting.contribution'; //#endregion diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts index aaee87fbcc..89cd098447 100644 --- a/src/vs/workbench/workbench.desktop.main.ts +++ b/src/vs/workbench/workbench.desktop.main.ts @@ -156,10 +156,10 @@ import 'vs/workbench/contrib/configExporter/node/configurationExportHelper.contr import 'sql/workbench/update/electron-browser/releaseNotes.contribution'; // query history -import 'sql/workbench/parts/queryHistory/electron-browser/queryHistory.contribution'; +import 'sql/workbench/contrib/queryHistory/electron-browser/queryHistory.contribution'; // CLI -import 'sql/workbench/parts/commandLine/electron-browser/commandLine.contribution'; +import 'sql/workbench/contrib/commandLine/electron-browser/commandLine.contribution'; //getting started -import 'sql/workbench/parts/welcome/gettingStarted/electron-browser/gettingStarted.contribution'; +import 'sql/workbench/contrib/welcome/gettingStarted/electron-browser/gettingStarted.contribution';