diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts index bfcbae58d6..1350a20bd6 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -47,73 +47,6 @@ import { coalesce } from 'vs/base/common/arrays'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; import { Layout } from 'vs/workbench/browser/layout'; -// {{SQL CARBON EDIT}} -import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; -import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; -import { ConnectionDialogService } from 'sql/workbench/services/connection/browser/connectionDialogService'; -import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { ErrorMessageService } from 'sql/workbench/services/errorMessage/browser/errorMessageService'; -import { ServerGroupController } from 'sql/workbench/services/serverGroup/browser/serverGroupController'; -import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController'; -import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; -import { AngularEventingService } from 'sql/platform/angularEventing/node/angularEventingService'; -import { ICapabilitiesService, CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { ICredentialsService, CredentialsService } from 'sql/platform/credentials/common/credentialsService'; -import { ISerializationService, SerializationService } from 'sql/platform/serialization/common/serializationService'; -import { IMetadataService, MetadataService } from 'sql/platform/metadata/common/metadataService'; -import { IObjectExplorerService, ObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; -import { ITaskService, TaskService } from 'sql/platform/taskHistory/common/taskService'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { QueryModelService } from 'sql/platform/query/common/queryModelService'; -import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; -import { QueryEditorService } from 'sql/workbench/services/queryEditor/browser/queryEditorService'; -import { IQueryManagementService, QueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { IEditorDescriptorService, EditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService'; -import { IScriptingService, ScriptingService } from 'sql/platform/scripting/common/scriptingService'; -import { IAdminService, AdminService } from 'sql/workbench/services/admin/common/adminService'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; -import { IDacFxService, DacFxService } from 'sql/platform/dacfx/common/dacFxService'; -import { IBackupService } from 'sql/platform/backup/common/backupService'; -import { BackupService } from 'sql/platform/backup/common/backupServiceImp'; -import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; -import { BackupUiService } from 'sql/workbench/services/backup/browser/backupUiService'; -import { IRestoreDialogController, IRestoreService } from 'sql/platform/restore/common/restoreService'; -import { RestoreService, RestoreDialogController } from 'sql/platform/restore/common/restoreServiceImpl'; -import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/common/newDashboardTabDialog'; -import { NewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialogService'; -import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; -import { FileBrowserService } from 'sql/platform/fileBrowser/common/fileBrowserService'; -import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController'; -import { FileBrowserDialogController } from 'sql/workbench/services/fileBrowser/browser/fileBrowserDialogController'; -import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; -import { InsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; -import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; -import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; -import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; -import { ProfilerService } from 'sql/workbench/services/profiler/common/profilerService'; -import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService'; -import { SqlOAuthService } from 'sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl'; -import { IClipboardService as sqlIClipboardService } from 'sql/platform/clipboard/common/clipboardService'; -import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-browser/clipboardService'; -import { AccountPickerService } from 'sql/platform/accountManagement/browser/accountPickerService'; -import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker'; -import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; -import { ResourceProviderService } from 'sql/workbench/services/resourceProvider/browser/resourceProviderService'; -import { IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; -import { DashboardViewService } from 'sql/platform/dashboard/common/dashboardViewServiceImpl'; -import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; -import { ModelViewService } from 'sql/platform/modelComponents/common/modelViewServiceImpl'; -import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; -import { DashboardService } from 'sql/platform/dashboard/browser/dashboardServiceImpl'; -import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; -import { ICommandLineProcessing } from 'sql/workbench/services/commandLine/common/commandLine'; -import { CommandLineService } from 'sql/workbench/services/commandLine/common/commandLineService'; -import { OEShimService, IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim'; -// {{SQL CARBON EDIT}} - End - export class Workbench extends Layout { private readonly _onShutdown = this._register(new Emitter()); @@ -289,50 +222,6 @@ export class Workbench extends Layout { const instantiationService = new InstantiationService(serviceCollection, true); - // {{SQL CARBON EDIT}} - // SQL Tools services - serviceCollection.set(IDashboardService, instantiationService.createInstance(DashboardService)); - serviceCollection.set(IDashboardViewService, instantiationService.createInstance(DashboardViewService)); - serviceCollection.set(IModelViewService, instantiationService.createInstance(ModelViewService)); - serviceCollection.set(IAngularEventingService, instantiationService.createInstance(AngularEventingService)); - serviceCollection.set(INewDashboardTabDialogService, instantiationService.createInstance(NewDashboardTabDialogService)); - serviceCollection.set(ISqlOAuthService, instantiationService.createInstance(SqlOAuthService)); - serviceCollection.set(sqlIClipboardService, instantiationService.createInstance(sqlClipboardService)); - serviceCollection.set(ICapabilitiesService, instantiationService.createInstance(CapabilitiesService)); - serviceCollection.set(IErrorMessageService, instantiationService.createInstance(ErrorMessageService)); - serviceCollection.set(IConnectionDialogService, instantiationService.createInstance(ConnectionDialogService)); - serviceCollection.set(IServerGroupController, instantiationService.createInstance(ServerGroupController)); - serviceCollection.set(ICredentialsService, instantiationService.createInstance(CredentialsService)); - serviceCollection.set(IResourceProviderService, instantiationService.createInstance(ResourceProviderService)); - serviceCollection.set(IAccountManagementService, instantiationService.createInstance(AccountManagementService, undefined)); - serviceCollection.set(IConnectionManagementService, instantiationService.createInstance(ConnectionManagementService, undefined, undefined)); - serviceCollection.set(ISerializationService, instantiationService.createInstance(SerializationService)); - serviceCollection.set(IQueryManagementService, instantiationService.createInstance(QueryManagementService)); - serviceCollection.set(IQueryModelService, instantiationService.createInstance(QueryModelService)); - serviceCollection.set(IQueryEditorService, instantiationService.createInstance(QueryEditorService)); - serviceCollection.set(IEditorDescriptorService, instantiationService.createInstance(EditorDescriptorService)); - serviceCollection.set(ITaskService, instantiationService.createInstance(TaskService)); - serviceCollection.set(IMetadataService, instantiationService.createInstance(MetadataService)); - serviceCollection.set(IObjectExplorerService, instantiationService.createInstance(ObjectExplorerService)); - serviceCollection.set(IOEShimService, instantiationService.createInstance(OEShimService)); - serviceCollection.set(IScriptingService, instantiationService.createInstance(ScriptingService)); - serviceCollection.set(IAdminService, instantiationService.createInstance(AdminService)); - serviceCollection.set(IJobManagementService, instantiationService.createInstance(JobManagementService)); - serviceCollection.set(IBackupService, instantiationService.createInstance(BackupService)); - serviceCollection.set(IBackupUiService, instantiationService.createInstance(BackupUiService)); - serviceCollection.set(IRestoreService, instantiationService.createInstance(RestoreService)); - serviceCollection.set(IRestoreDialogController, instantiationService.createInstance(RestoreDialogController)); - serviceCollection.set(IFileBrowserService, instantiationService.createInstance(FileBrowserService)); - serviceCollection.set(IFileBrowserDialogController, instantiationService.createInstance(FileBrowserDialogController)); - serviceCollection.set(IInsightsDialogService, instantiationService.createInstance(InsightsDialogService)); - serviceCollection.set(INotebookService, instantiationService.createInstance(NotebookService)); - serviceCollection.set(IAccountPickerService, instantiationService.createInstance(AccountPickerService)); - serviceCollection.set(IProfilerService, instantiationService.createInstance(ProfilerService)); - serviceCollection.set(ICommandLineProcessing, instantiationService.createInstance(CommandLineService)); - serviceCollection.set(IDacFxService, instantiationService.createInstance(DacFxService)); - - // {{SQL CARBON EDIT}} - End - // Wrap up instantiationService.invokeFunction(accessor => { const lifecycleService = accessor.get(ILifecycleService); diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index be4f4abb87..a5320b64a9 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -166,6 +166,113 @@ registerSingleton(IURLService, RelayURLService); //#endregion +// {{SQL CARBON EDIT}} - SQL-specific services +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; +import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; +import { ConnectionDialogService } from 'sql/workbench/services/connection/browser/connectionDialogService'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; +import { ErrorMessageService } from 'sql/workbench/services/errorMessage/browser/errorMessageService'; +import { ServerGroupController } from 'sql/workbench/services/serverGroup/browser/serverGroupController'; +import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController'; +import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; +import { AngularEventingService } from 'sql/platform/angularEventing/node/angularEventingService'; +import { ICapabilitiesService, CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ICredentialsService, CredentialsService } from 'sql/platform/credentials/common/credentialsService'; +import { ISerializationService, SerializationService } from 'sql/platform/serialization/common/serializationService'; +import { IMetadataService, MetadataService } from 'sql/platform/metadata/common/metadataService'; +import { IObjectExplorerService, ObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { ITaskService, TaskService } from 'sql/platform/taskHistory/common/taskService'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { QueryModelService } from 'sql/platform/query/common/queryModelService'; +import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; +import { QueryEditorService } from 'sql/workbench/services/queryEditor/browser/queryEditorService'; +import { IQueryManagementService, QueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IEditorDescriptorService, EditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService'; +import { IScriptingService, ScriptingService } from 'sql/platform/scripting/common/scriptingService'; +import { IAdminService, AdminService } from 'sql/workbench/services/admin/common/adminService'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; +import { IDacFxService, DacFxService } from 'sql/platform/dacfx/common/dacFxService'; +import { IBackupService } from 'sql/platform/backup/common/backupService'; +import { BackupService } from 'sql/platform/backup/common/backupServiceImp'; +import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; +import { BackupUiService } from 'sql/workbench/services/backup/browser/backupUiService'; +import { IRestoreDialogController, IRestoreService } from 'sql/platform/restore/common/restoreService'; +import { RestoreService, RestoreDialogController } from 'sql/platform/restore/common/restoreServiceImpl'; +import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/common/newDashboardTabDialog'; +import { NewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialogService'; +import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; +import { FileBrowserService } from 'sql/platform/fileBrowser/common/fileBrowserService'; +import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController'; +import { FileBrowserDialogController } from 'sql/workbench/services/fileBrowser/browser/fileBrowserDialogController'; +import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; +import { InsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; +import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; +import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { ProfilerService } from 'sql/workbench/services/profiler/common/profilerService'; +import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService'; +import { SqlOAuthService } from 'sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl'; +import { IClipboardService as sqlIClipboardService } from 'sql/platform/clipboard/common/clipboardService'; +import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-browser/clipboardService'; +import { AccountPickerService } from 'sql/platform/accountManagement/browser/accountPickerService'; +import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker'; +import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; +import { ResourceProviderService } from 'sql/workbench/services/resourceProvider/browser/resourceProviderService'; +import { IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; +import { DashboardViewService } from 'sql/platform/dashboard/common/dashboardViewServiceImpl'; +import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; +import { ModelViewService } from 'sql/platform/modelComponents/common/modelViewServiceImpl'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; +import { DashboardService } from 'sql/platform/dashboard/browser/dashboardServiceImpl'; +import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; +import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { ICommandLineProcessing } from 'sql/workbench/services/commandLine/common/commandLine'; +import { CommandLineService } from 'sql/workbench/services/commandLine/common/commandLineService'; +import { OEShimService, IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim'; + +registerSingleton(IDashboardService, DashboardService); +registerSingleton(IDashboardViewService, DashboardViewService); +registerSingleton(IModelViewService, ModelViewService); +registerSingleton(IAngularEventingService, AngularEventingService); +registerSingleton(INewDashboardTabDialogService, NewDashboardTabDialogService); +registerSingleton(ISqlOAuthService, SqlOAuthService); +registerSingleton(sqlIClipboardService, sqlClipboardService); +registerSingleton(ICapabilitiesService, CapabilitiesService); +registerSingleton(IErrorMessageService, ErrorMessageService); +registerSingleton(IConnectionDialogService, ConnectionDialogService); +registerSingleton(IServerGroupController, ServerGroupController); +registerSingleton(ICredentialsService, CredentialsService); +registerSingleton(IResourceProviderService, ResourceProviderService); +registerSingleton(IAccountManagementService, AccountManagementService); +registerSingleton(IConnectionManagementService, ConnectionManagementService as any); +registerSingleton(ISerializationService, SerializationService); +registerSingleton(IQueryManagementService, QueryManagementService); +registerSingleton(IQueryModelService, QueryModelService); +registerSingleton(IQueryEditorService, QueryEditorService); +registerSingleton(IEditorDescriptorService, EditorDescriptorService); +registerSingleton(ITaskService, TaskService); +registerSingleton(IMetadataService, MetadataService); +registerSingleton(IObjectExplorerService, ObjectExplorerService); +registerSingleton(IOEShimService, OEShimService); +registerSingleton(IScriptingService, ScriptingService); +registerSingleton(IAdminService, AdminService); +registerSingleton(IJobManagementService, JobManagementService); +registerSingleton(IBackupService, BackupService); +registerSingleton(IBackupUiService, BackupUiService); +registerSingleton(IRestoreService, RestoreService); +registerSingleton(IRestoreDialogController, RestoreDialogController); +registerSingleton(IFileBrowserService, FileBrowserService); +registerSingleton(IFileBrowserDialogController, FileBrowserDialogController); +registerSingleton(IInsightsDialogService, InsightsDialogService); +registerSingleton(INotebookService, NotebookService); +registerSingleton(IAccountPickerService, AccountPickerService); +registerSingleton(IProfilerService, ProfilerService); +registerSingleton(ICommandLineProcessing, CommandLineService); +registerSingleton(IDacFxService, DacFxService); +// {{SQL CARBON EDIT}} - End + //#region --- workbench parts import 'vs/workbench/browser/parts/quickinput/quickInput';