diff --git a/src/sql/platform/connection/common/connectionManagementService.ts b/src/sql/platform/connection/common/connectionManagementService.ts index 64a5abc861..e59ceff49c 100644 --- a/src/sql/platform/connection/common/connectionManagementService.ts +++ b/src/sql/platform/connection/common/connectionManagementService.ts @@ -20,7 +20,6 @@ import * as ConnectionContracts from 'sql/workbench/parts/connection/common/conn import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; import { ConnectionGlobalStatus } from 'sql/workbench/parts/connection/common/connectionGlobalStatus'; -import { ConnectionStatusbarItem } from 'sql/workbench/parts/connection/browser/connectionStatus'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities'; import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; @@ -44,12 +43,9 @@ import * as platform from 'vs/platform/registry/common/platform'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { Event, Emitter } from 'vs/base/common/event'; -import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart'; -import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar'; -import { IStatusbarService, StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar'; +import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; -import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ILogService } from 'vs/platform/log/common/log'; import * as interfaces from './interfaces'; @@ -85,7 +81,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti @IConfigurationService private _configurationService: IConfigurationService, @ICapabilitiesService private _capabilitiesService: ICapabilitiesService, @IQuickInputService private _quickInputService: IQuickInputService, - @IEditorGroupsService private _editorGroupService: IEditorGroupsService, @IStatusbarService private _statusBarService: IStatusbarService, @IResourceProviderService private _resourceProviderService: IResourceProviderService, @IAngularEventingService private _angularEventing: IAngularEventingService, @@ -98,13 +93,6 @@ export class ConnectionManagementService extends Disposable implements IConnecti this._connectionStore = _instantiationService.createInstance(ConnectionStore); } - // Register Statusbar item - (platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor( - ConnectionStatusbarItem, - StatusbarAlignment.RIGHT, - 100 /* High Priority */ - )); - const registry = platform.Registry.as(ConnectionProviderExtensions.ConnectionProviderContributions); let providerRegistration = (p: { id: string, properties: ConnectionProviderProperties }) => { diff --git a/src/sql/workbench/parts/connection/browser/connection.contribution.ts b/src/sql/workbench/parts/connection/browser/connection.contribution.ts index f962f74ef9..227bdd3d16 100644 --- a/src/sql/workbench/parts/connection/browser/connection.contribution.ts +++ b/src/sql/workbench/parts/connection/browser/connection.contribution.ts @@ -11,6 +11,17 @@ import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from ' import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { localize } from 'vs/nls'; +import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar'; +import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar'; +import { ConnectionStatusbarItem } from 'sql/workbench/parts/connection/browser/connectionStatus'; + + +// Register Statusbar item +(Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor( + ConnectionStatusbarItem, + StatusbarAlignment.RIGHT, + 100 /* High Priority */ +)); // Connection Dashboard registration diff --git a/src/sqltest/parts/connection/connectionManagementService.test.ts b/src/sqltest/parts/connection/connectionManagementService.test.ts index 487a078860..9ab1b494a7 100644 --- a/src/sqltest/parts/connection/connectionManagementService.test.ts +++ b/src/sqltest/parts/connection/connectionManagementService.test.ts @@ -158,7 +158,6 @@ suite('SQL ConnectionManagementService tests', () => { workspaceConfigurationServiceMock.object, capabilitiesService, undefined, - editorGroupService.object, undefined, resourceProviderStubMock.object, undefined,