diff --git a/src/sqltest/utils/testUtils.ts b/src/sql/base/test/common/async.ts similarity index 85% rename from src/sqltest/utils/testUtils.ts rename to src/sql/base/test/common/async.ts index 8ab8d17852..3e4a3d1f37 100644 --- a/src/sqltest/utils/testUtils.ts +++ b/src/sql/base/test/common/async.ts @@ -5,7 +5,7 @@ import * as assert from 'assert'; -export async function assertThrowsAsync(fn, expectedMessage?: string): Promise { +export async function assertThrowsAsync(fn: () => Promise, expectedMessage?: string): Promise { let threw = false; try { await fn(); diff --git a/src/sqltest/utils/eventVerifier.ts b/src/sql/base/test/common/event.ts similarity index 100% rename from src/sqltest/utils/eventVerifier.ts rename to src/sql/base/test/common/event.ts diff --git a/src/sql/platform/accounts/test/common/accountPickerViewModel.test.ts b/src/sql/platform/accounts/test/common/accountPickerViewModel.test.ts index fccbab0824..2bdcba0ef7 100644 --- a/src/sql/platform/accounts/test/common/accountPickerViewModel.test.ts +++ b/src/sql/platform/accounts/test/common/accountPickerViewModel.test.ts @@ -6,11 +6,11 @@ import * as azdata from 'azdata'; import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; -import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { Emitter } from 'vs/base/common/event'; import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel'; import { UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes'; import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService'; +import { EventVerifierSingle } from 'sql/base/test/common/event'; // SUITE STATE ///////////////////////////////////////////////////////////// let mockUpdateAccountEmitter: Emitter; diff --git a/src/sql/platform/accounts/test/common/accountStore.test.ts b/src/sql/platform/accounts/test/common/accountStore.test.ts index c016198e8b..adeb2ff1b5 100644 --- a/src/sql/platform/accounts/test/common/accountStore.test.ts +++ b/src/sql/platform/accounts/test/common/accountStore.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as azdata from 'azdata'; import AccountStore from 'sql/platform/accounts/common/accountStore'; -import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; +import { EventVerifierSingle } from 'sql/base/test/common/event'; suite('Account Store Tests', () => { test('AddOrUpdate - Uninitialized memento', done => { diff --git a/src/sql/platform/accounts/test/common/accountViewModel.test.ts b/src/sql/platform/accounts/test/common/accountViewModel.test.ts index c4af602ef0..e14295694e 100644 --- a/src/sql/platform/accounts/test/common/accountViewModel.test.ts +++ b/src/sql/platform/accounts/test/common/accountViewModel.test.ts @@ -6,11 +6,11 @@ import * as assert from 'assert'; import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; -import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { Emitter } from 'vs/base/common/event'; import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel'; import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes'; import { TestAccountManagementService } from 'sql/platform/accounts/test/common/testAccountManagementService'; +import { EventVerifierSingle } from 'sql/base/test/common/event'; // SUITE STATE ///////////////////////////////////////////////////////////// let mockAddProviderEmitter: Emitter; diff --git a/src/sql/platform/angularEventing/common/angularEventingService.ts b/src/sql/platform/angularEventing/browser/angularEventingService.ts similarity index 100% rename from src/sql/platform/angularEventing/common/angularEventingService.ts rename to src/sql/platform/angularEventing/browser/angularEventingService.ts diff --git a/src/sql/platform/angularEventing/node/angularEventingService.ts b/src/sql/platform/angularEventing/browser/angularEventingServiceImpl.ts similarity index 95% rename from src/sql/platform/angularEventing/node/angularEventingService.ts rename to src/sql/platform/angularEventing/browser/angularEventingServiceImpl.ts index 33b1f15fb3..b0c5807fcf 100644 --- a/src/sql/platform/angularEventing/node/angularEventingService.ts +++ b/src/sql/platform/angularEventing/browser/angularEventingServiceImpl.ts @@ -6,7 +6,7 @@ import { Subject } from 'rxjs/Subject'; import { Subscription } from 'rxjs/Subscription'; -import { IAngularEventingService, IAngularEvent, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; +import { IAngularEventingService, IAngularEvent, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; import { ILogService } from 'vs/platform/log/common/log'; export class AngularEventingService implements IAngularEventingService { diff --git a/src/sql/platform/capabilities/common/capabilitiesService.ts b/src/sql/platform/capabilities/common/capabilitiesService.ts index 1f8a8f3844..948a7a6b39 100644 --- a/src/sql/platform/capabilities/common/capabilitiesService.ts +++ b/src/sql/platform/capabilities/common/capabilitiesService.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; - import * as azdata from 'azdata'; import { Event } from 'vs/base/common/event'; @@ -19,6 +17,12 @@ export const clientCapabilities = { hostVersion: HOST_VERSION }; +export interface ConnectionProviderProperties { + providerId: string; + displayName: string; + connectionOptions: azdata.ConnectionOption[]; +} + export interface ProviderFeatures { connection: ConnectionProviderProperties; } diff --git a/src/sql/platform/connection/common/connectionManagement.ts b/src/sql/platform/connection/common/connectionManagement.ts index 0952bf0f33..f1f0342e1e 100644 --- a/src/sql/platform/connection/common/connectionManagement.ts +++ b/src/sql/platform/connection/common/connectionManagement.ts @@ -10,8 +10,7 @@ import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/co import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; -import { IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController'; -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; /** * Options for the actions that could happen after connecting is complete diff --git a/src/sql/platform/connection/common/providerConnectionInfo.ts b/src/sql/platform/connection/common/providerConnectionInfo.ts index e8319a9b20..70fe2abc4f 100644 --- a/src/sql/platform/connection/common/providerConnectionInfo.ts +++ b/src/sql/platform/connection/common/providerConnectionInfo.ts @@ -9,8 +9,7 @@ import { isString } from 'vs/base/common/types'; import * as azdata from 'azdata'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as Constants from 'sql/platform/connection/common/constants'; -import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { ICapabilitiesService, ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; type SettableProperty = 'serverName' | 'authenticationType' | 'databaseName' | 'password' | 'connectionName' | 'userName'; diff --git a/src/sql/platform/connection/test/common/connectionProfile.test.ts b/src/sql/platform/connection/test/common/connectionProfile.test.ts index e9e07b98b7..c5e9fa3744 100644 --- a/src/sql/platform/connection/test/common/connectionProfile.test.ts +++ b/src/sql/platform/connection/test/common/connectionProfile.test.ts @@ -9,8 +9,8 @@ import * as azdata from 'azdata'; import * as assert from 'assert'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; suite('SQL ConnectionProfileInfo tests', () => { let msSQLCapabilities: ConnectionProviderProperties; diff --git a/src/sql/platform/connection/test/common/connectionStore.test.ts b/src/sql/platform/connection/test/common/connectionStore.test.ts index 8b9cfe1e45..3bab1cb70f 100644 --- a/src/sql/platform/connection/test/common/connectionStore.test.ts +++ b/src/sql/platform/connection/test/common/connectionStore.test.ts @@ -12,12 +12,12 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService'; import { TestCredentialsService } from 'sql/platform/credentials/test/common/testCredentialsService'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { deepClone, deepFreeze } from 'vs/base/common/objects'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; -import { TestStorageService } from 'vs/workbench/test/workbenchTestServices'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; +import { InMemoryStorageService } from 'vs/platform/storage/common/storage'; suite('ConnectionStore', () => { let defaultNamedProfile: IConnectionProfile = deepFreeze({ @@ -142,7 +142,7 @@ suite('ConnectionStore', () => { // Given 5 is the max # creds const numCreds = 6; - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -169,7 +169,7 @@ suite('ConnectionStore', () => { }); test('getRecentlyUsedConnections should return connection for given provider', () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); const connectionStore = new ConnectionStore(storageService, configurationService, @@ -181,7 +181,7 @@ suite('ConnectionStore', () => { test('addActiveConnection should add same connection exactly once', async () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -204,7 +204,7 @@ suite('ConnectionStore', () => { // Setup credential store to capture credentials sent to it - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -251,7 +251,7 @@ suite('ConnectionStore', () => { }); test('can clear connections list', async () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -268,7 +268,7 @@ suite('ConnectionStore', () => { }); test('isPasswordRequired should return true for MSSQL SqlLogin', () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -279,7 +279,7 @@ suite('ConnectionStore', () => { }); test('isPasswordRequired should return true for MSSQL SqlLogin for connection profile object', () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -291,7 +291,7 @@ suite('ConnectionStore', () => { }); test('isPasswordRequired should return false if the password is not required in capabilities', () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -318,7 +318,7 @@ suite('ConnectionStore', () => { }); test('saveProfile should save the password after the profile is saved', async () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -335,7 +335,7 @@ suite('ConnectionStore', () => { }); test('getGroupFromId returns undefined when there is no group with the given ID', () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -346,7 +346,7 @@ suite('ConnectionStore', () => { }); test('getGroupFromId returns the group that has the given ID', () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -384,7 +384,7 @@ suite('ConnectionStore', () => { }); test('getProfileWithoutPassword can return the profile without credentials in the password property or options dictionary', () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -402,7 +402,7 @@ suite('ConnectionStore', () => { }); test('addPassword gets the password from the credentials service', async () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -422,7 +422,7 @@ suite('ConnectionStore', () => { }); test('getConnectionProfileGroups', async () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -459,7 +459,7 @@ suite('ConnectionStore', () => { }); test('removing connection correctly removes', async () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); @@ -484,7 +484,7 @@ suite('ConnectionStore', () => { }); test('getRecentlyUsedConnections correctly fills in group names', async () => { - const storageService = new TestStorageService(); + const storageService = new InMemoryStorageService(); const configurationService = new TestConfigurationService(); const credentialsService = new TestCredentialsService(); diff --git a/src/sql/platform/connection/test/common/testConnectionManagementService.ts b/src/sql/platform/connection/test/common/testConnectionManagementService.ts index 9a49a95a78..b1f1ebc161 100644 --- a/src/sql/platform/connection/test/common/testConnectionManagementService.ts +++ b/src/sql/platform/connection/test/common/testConnectionManagementService.ts @@ -11,7 +11,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as azdata from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; // Test stubs for commonly used objects diff --git a/src/sql/platform/connection/test/common/connectionStatusManager.test.ts b/src/sql/platform/connection/test/node/connectionStatusManager.test.ts similarity index 96% rename from src/sql/platform/connection/test/common/connectionStatusManager.test.ts rename to src/sql/platform/connection/test/node/connectionStatusManager.test.ts index abaa455cae..3a926aae34 100644 --- a/src/sql/platform/connection/test/common/connectionStatusManager.test.ts +++ b/src/sql/platform/connection/test/node/connectionStatusManager.test.ts @@ -10,10 +10,11 @@ import * as Utils from 'sql/platform/connection/common/utils'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices'; import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { NullLogService } from 'vs/platform/log/common/log'; +import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; +import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv'; let connections: ConnectionStatusManager; let capabilitiesService: TestCapabilitiesService; @@ -78,7 +79,9 @@ suite('SQL ConnectionStatusManager tests', () => { setup(() => { capabilitiesService = new TestCapabilitiesService(); connectionProfileObject = new ConnectionProfile(capabilitiesService, connectionProfile); - connections = new ConnectionStatusManager(capabilitiesService, new NullLogService(), TestEnvironmentService, new TestNotificationService()); + + const environmentService = new EnvironmentService(parseArgs(process.argv, OPTIONS), process.execPath); + connections = new ConnectionStatusManager(capabilitiesService, new NullLogService(), environmentService, new TestNotificationService()); connection1Id = Utils.generateUri(connectionProfile); connection2Id = 'connection2Id'; connection3Id = 'connection3Id'; diff --git a/src/sql/platform/queryHistory/common/queryHistoryServiceImpl.ts b/src/sql/platform/queryHistory/common/queryHistoryServiceImpl.ts index 985dec9cde..41dae1e483 100644 --- a/src/sql/platform/queryHistory/common/queryHistoryServiceImpl.ts +++ b/src/sql/platform/queryHistory/common/queryHistoryServiceImpl.ts @@ -14,7 +14,6 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { Event, Emitter } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; -import { IConfigurationChangedEvent } from 'sql/workbench/parts/profiler/browser/profilerFindWidget'; /** * Service that collects the results of executed queries diff --git a/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts b/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts index 1a03a811e8..e414362ab8 100644 --- a/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts +++ b/src/sql/workbench/api/browser/mainThreadModelViewDialog.ts @@ -9,8 +9,8 @@ import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { MainThreadModelViewDialogShape, SqlMainContext, ExtHostModelViewDialogShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol'; -import { Dialog, DialogTab, DialogButton, WizardPage, Wizard } from 'sql/platform/dialog/common/dialogTypes'; -import { CustomDialogService } from 'sql/platform/dialog/browser/customDialogService'; +import { Dialog, DialogTab, DialogButton, WizardPage, Wizard } from 'sql/workbench/services/dialog/common/dialogTypes'; +import { CustomDialogService } from 'sql/workbench/services/dialog/browser/customDialogService'; import { IModelViewDialogDetails, IModelViewTabDetails, IModelViewButtonDetails, IModelViewWizardPageDetails, IModelViewWizardDetails } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/workbench/browser/modelComponents/modelViewInput'; diff --git a/src/sql/workbench/browser/actions.ts b/src/sql/workbench/browser/actions.ts index 2369784835..bc159e8eaf 100644 --- a/src/sql/workbench/browser/actions.ts +++ b/src/sql/workbench/browser/actions.ts @@ -5,7 +5,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; +import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; diff --git a/src/sql/workbench/browser/modelComponents/checkbox.component.ts b/src/sql/workbench/browser/modelComponents/checkbox.component.ts index 1ff8f3d1d9..62fc5b9958 100644 --- a/src/sql/workbench/browser/modelComponents/checkbox.component.ts +++ b/src/sql/workbench/browser/modelComponents/checkbox.component.ts @@ -13,7 +13,7 @@ import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/workbench/browser/modelComponents/formContainer.component.ts b/src/sql/workbench/browser/modelComponents/formContainer.component.ts index 1f423b9d57..894fca05b4 100644 --- a/src/sql/workbench/browser/modelComponents/formContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/formContainer.component.ts @@ -13,7 +13,7 @@ import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/bro import { FormLayout, FormItemLayout } from 'azdata'; import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; export interface TitledFormItemLayout { title: string; diff --git a/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts b/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts index 423f6fe6d0..5a2d3c9b43 100644 --- a/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts +++ b/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts @@ -19,10 +19,10 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { memoize } from 'vs/base/common/decorators'; import { generateUuid } from 'vs/base/common/uuid'; import { Event } from 'vs/base/common/event'; -import { LayoutRequestParams } from 'sql/platform/dialog/browser/dialogContainer.component'; +import { LayoutRequestParams } from 'sql/workbench/services/dialog/browser/dialogContainer.component'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import { ILogService } from 'vs/platform/log/common/log'; -import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; const componentRegistry = Registry.as(Extensions.ComponentContribution); diff --git a/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts b/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts index 685a5f8ea5..7cb79465f9 100644 --- a/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts +++ b/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts @@ -10,7 +10,7 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; import { memoize } from 'vs/base/common/decorators'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IModelView } from 'sql/platform/model/browser/modelViewService'; import { ViewBase } from 'sql/workbench/browser/modelComponents/viewBase'; import { IModelViewService } from 'sql/platform/modelComponents/browser/modelViewService'; diff --git a/src/sql/workbench/browser/modelComponents/modelViewInput.ts b/src/sql/workbench/browser/modelComponents/modelViewInput.ts index 06b1f4313a..002249b48c 100644 --- a/src/sql/workbench/browser/modelComponents/modelViewInput.ts +++ b/src/sql/workbench/browser/modelComponents/modelViewInput.ts @@ -10,7 +10,7 @@ import { EditorInput, EditorModel, ConfirmResult } from 'vs/workbench/common/edi import * as DOM from 'vs/base/browser/dom'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { DialogPane } from 'sql/platform/dialog/browser/dialogPane'; +import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; import { Emitter, Event } from 'vs/base/common/event'; import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService'; import { IThemeService } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts b/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts index 395a5eb17f..91965a15b3 100644 --- a/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts @@ -14,7 +14,7 @@ import { Orientation, ToolbarLayout } from 'sql/workbench/api/common/sqlExtHostT import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; export interface ToolbarItemConfig { title?: string; diff --git a/src/sql/workbench/browser/modelComponents/tree.component.ts b/src/sql/workbench/browser/modelComponents/tree.component.ts index 1aad8d984b..e988aec653 100644 --- a/src/sql/workbench/browser/modelComponents/tree.component.ts +++ b/src/sql/workbench/browser/modelComponents/tree.component.ts @@ -14,7 +14,7 @@ import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { TreeComponentRenderer } from 'sql/workbench/browser/modelComponents/treeComponentRenderer'; import { TreeComponentDataSource } from 'sql/workbench/browser/modelComponents/treeDataSource'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/platform/accounts/browser/accountDialog.ts b/src/sql/workbench/parts/accounts/browser/accountDialog.ts similarity index 99% rename from src/sql/platform/accounts/browser/accountDialog.ts rename to src/sql/workbench/parts/accounts/browser/accountDialog.ts index de8e3671b8..47d93a0bcc 100644 --- a/src/sql/platform/accounts/browser/accountDialog.ts +++ b/src/sql/workbench/parts/accounts/browser/accountDialog.ts @@ -29,7 +29,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/platform/accounts/browser/accountListRenderer'; +import { AccountListRenderer, AccountListDelegate } from 'sql/workbench/parts/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/platform/accounts/browser/accountDialogController.ts b/src/sql/workbench/parts/accounts/browser/accountDialogController.ts similarity index 95% rename from src/sql/platform/accounts/browser/accountDialogController.ts rename to src/sql/workbench/parts/accounts/browser/accountDialogController.ts index 205ea47a12..d0eb3bf6af 100644 --- a/src/sql/platform/accounts/browser/accountDialogController.ts +++ b/src/sql/workbench/parts/accounts/browser/accountDialogController.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import Severity from 'vs/base/common/severity'; -import { AccountDialog } from 'sql/platform/accounts/browser/accountDialog'; +import { AccountDialog } from 'sql/workbench/parts/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/platform/accounts/browser/accountListRenderer.ts b/src/sql/workbench/parts/accounts/browser/accountListRenderer.ts similarity index 100% rename from src/sql/platform/accounts/browser/accountListRenderer.ts rename to src/sql/workbench/parts/accounts/browser/accountListRenderer.ts diff --git a/src/sql/platform/accounts/browser/accountManagement.contribution.ts b/src/sql/workbench/parts/accounts/browser/accountManagement.contribution.ts similarity index 100% rename from src/sql/platform/accounts/browser/accountManagement.contribution.ts rename to src/sql/workbench/parts/accounts/browser/accountManagement.contribution.ts diff --git a/src/sql/platform/accounts/browser/accountPicker.ts b/src/sql/workbench/parts/accounts/browser/accountPicker.ts similarity index 100% rename from src/sql/platform/accounts/browser/accountPicker.ts rename to src/sql/workbench/parts/accounts/browser/accountPicker.ts diff --git a/src/sql/platform/accounts/browser/accountPickerImpl.ts b/src/sql/workbench/parts/accounts/browser/accountPickerImpl.ts similarity index 99% rename from src/sql/platform/accounts/browser/accountPickerImpl.ts rename to src/sql/workbench/parts/accounts/browser/accountPickerImpl.ts index f718776845..825093b572 100644 --- a/src/sql/platform/accounts/browser/accountPickerImpl.ts +++ b/src/sql/workbench/parts/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/platform/accounts/browser/accountListRenderer'; +import { AccountPickerListRenderer, AccountListDelegate } from 'sql/workbench/parts/accounts/browser/accountListRenderer'; import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel'; export class AccountPicker extends Disposable { diff --git a/src/sql/platform/accounts/browser/accountPickerService.ts b/src/sql/workbench/parts/accounts/browser/accountPickerService.ts similarity index 93% rename from src/sql/platform/accounts/browser/accountPickerService.ts rename to src/sql/workbench/parts/accounts/browser/accountPickerService.ts index d92c7a2ad3..c912a87d18 100644 --- a/src/sql/platform/accounts/browser/accountPickerService.ts +++ b/src/sql/workbench/parts/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/platform/accounts/browser/accountPicker'; -import { AccountPicker } from 'sql/platform/accounts/browser/accountPickerImpl'; +import { IAccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPicker'; +import { AccountPicker } from 'sql/workbench/parts/accounts/browser/accountPickerImpl'; export class AccountPickerService implements IAccountPickerService { _serviceBrand: undefined; diff --git a/src/sql/platform/accounts/browser/autoOAuthDialog.ts b/src/sql/workbench/parts/accounts/browser/autoOAuthDialog.ts similarity index 100% rename from src/sql/platform/accounts/browser/autoOAuthDialog.ts rename to src/sql/workbench/parts/accounts/browser/autoOAuthDialog.ts diff --git a/src/sql/platform/accounts/browser/autoOAuthDialogController.ts b/src/sql/workbench/parts/accounts/browser/autoOAuthDialogController.ts similarity index 97% rename from src/sql/platform/accounts/browser/autoOAuthDialogController.ts rename to src/sql/workbench/parts/accounts/browser/autoOAuthDialogController.ts index a963edbfeb..ce5d7cac74 100644 --- a/src/sql/platform/accounts/browser/autoOAuthDialogController.ts +++ b/src/sql/workbench/parts/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/platform/accounts/browser/autoOAuthDialog'; +import { AutoOAuthDialog } from 'sql/workbench/parts/accounts/browser/autoOAuthDialog'; import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/platform/accounts/browser/firewallRuleDialog.ts b/src/sql/workbench/parts/accounts/browser/firewallRuleDialog.ts similarity index 99% rename from src/sql/platform/accounts/browser/firewallRuleDialog.ts rename to src/sql/workbench/parts/accounts/browser/firewallRuleDialog.ts index fc47a26101..3751dee8d2 100644 --- a/src/sql/platform/accounts/browser/firewallRuleDialog.ts +++ b/src/sql/workbench/parts/accounts/browser/firewallRuleDialog.ts @@ -25,7 +25,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/platform/accounts/browser/accountPicker'; +import { IAccountPickerService } from 'sql/workbench/parts/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/platform/accounts/browser/firewallRuleDialogController.ts b/src/sql/workbench/parts/accounts/browser/firewallRuleDialogController.ts similarity index 97% rename from src/sql/platform/accounts/browser/firewallRuleDialogController.ts rename to src/sql/workbench/parts/accounts/browser/firewallRuleDialogController.ts index bc0ecf3a7c..3d0a3985a1 100644 --- a/src/sql/platform/accounts/browser/firewallRuleDialogController.ts +++ b/src/sql/workbench/parts/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/platform/accounts/browser/firewallRuleDialog'; +import { FirewallRuleDialog } from 'sql/workbench/parts/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/platform/accounts/browser/media/accountActions.css b/src/sql/workbench/parts/accounts/browser/media/accountActions.css similarity index 100% rename from src/sql/platform/accounts/browser/media/accountActions.css rename to src/sql/workbench/parts/accounts/browser/media/accountActions.css diff --git a/src/sql/platform/accounts/browser/media/accountDialog.css b/src/sql/workbench/parts/accounts/browser/media/accountDialog.css similarity index 100% rename from src/sql/platform/accounts/browser/media/accountDialog.css rename to src/sql/workbench/parts/accounts/browser/media/accountDialog.css diff --git a/src/sql/platform/accounts/browser/media/accountListRenderer.css b/src/sql/workbench/parts/accounts/browser/media/accountListRenderer.css similarity index 100% rename from src/sql/platform/accounts/browser/media/accountListRenderer.css rename to src/sql/workbench/parts/accounts/browser/media/accountListRenderer.css diff --git a/src/sql/platform/accounts/browser/media/accountListStatusbarItem.css b/src/sql/workbench/parts/accounts/browser/media/accountListStatusbarItem.css similarity index 100% rename from src/sql/platform/accounts/browser/media/accountListStatusbarItem.css rename to src/sql/workbench/parts/accounts/browser/media/accountListStatusbarItem.css diff --git a/src/sql/platform/accounts/browser/media/accountPicker.css b/src/sql/workbench/parts/accounts/browser/media/accountPicker.css similarity index 100% rename from src/sql/platform/accounts/browser/media/accountPicker.css rename to src/sql/workbench/parts/accounts/browser/media/accountPicker.css diff --git a/src/sql/platform/accounts/browser/media/accounts_statusbar_inverse.svg b/src/sql/workbench/parts/accounts/browser/media/accounts_statusbar_inverse.svg similarity index 100% rename from src/sql/platform/accounts/browser/media/accounts_statusbar_inverse.svg rename to src/sql/workbench/parts/accounts/browser/media/accounts_statusbar_inverse.svg diff --git a/src/sql/platform/accounts/browser/media/autoOAuthDialog.css b/src/sql/workbench/parts/accounts/browser/media/autoOAuthDialog.css similarity index 100% rename from src/sql/platform/accounts/browser/media/autoOAuthDialog.css rename to src/sql/workbench/parts/accounts/browser/media/autoOAuthDialog.css diff --git a/src/sql/platform/accounts/browser/media/firewallRuleDialog.css b/src/sql/workbench/parts/accounts/browser/media/firewallRuleDialog.css similarity index 100% rename from src/sql/platform/accounts/browser/media/firewallRuleDialog.css rename to src/sql/workbench/parts/accounts/browser/media/firewallRuleDialog.css diff --git a/src/sql/platform/accounts/browser/media/new_account.svg b/src/sql/workbench/parts/accounts/browser/media/new_account.svg similarity index 100% rename from src/sql/platform/accounts/browser/media/new_account.svg rename to src/sql/workbench/parts/accounts/browser/media/new_account.svg diff --git a/src/sql/platform/accounts/browser/media/new_account_inverse.svg b/src/sql/workbench/parts/accounts/browser/media/new_account_inverse.svg similarity index 100% rename from src/sql/platform/accounts/browser/media/new_account_inverse.svg rename to src/sql/workbench/parts/accounts/browser/media/new_account_inverse.svg diff --git a/src/sql/platform/accounts/browser/media/secure.svg b/src/sql/workbench/parts/accounts/browser/media/secure.svg similarity index 100% rename from src/sql/platform/accounts/browser/media/secure.svg rename to src/sql/workbench/parts/accounts/browser/media/secure.svg diff --git a/src/sql/platform/accounts/test/browser/accountDialogController.test.ts b/src/sql/workbench/parts/accounts/test/browser/accountDialogController.test.ts similarity index 94% rename from src/sql/platform/accounts/test/browser/accountDialogController.test.ts rename to src/sql/workbench/parts/accounts/test/browser/accountDialogController.test.ts index d31568634e..c23c25dd43 100644 --- a/src/sql/platform/accounts/test/browser/accountDialogController.test.ts +++ b/src/sql/workbench/parts/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/platform/accounts/browser/accountDialog'; -import { AccountDialogController } from 'sql/platform/accounts/browser/accountDialogController'; +import { AccountDialog } from 'sql/workbench/parts/accounts/browser/accountDialog'; +import { AccountDialogController } from 'sql/workbench/parts/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/platform/accounts/browser/accountListRenderer'; +import { AccountListRenderer } from 'sql/workbench/parts/accounts/browser/accountListRenderer'; import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService'; // TESTS /////////////////////////////////////////////////////////////////// diff --git a/src/sql/platform/accounts/test/browser/accountPickerService.test.ts b/src/sql/workbench/parts/accounts/test/browser/accountPickerService.test.ts similarity index 95% rename from src/sql/platform/accounts/test/browser/accountPickerService.test.ts rename to src/sql/workbench/parts/accounts/test/browser/accountPickerService.test.ts index 52e05c0fde..6ba950a465 100644 --- a/src/sql/platform/accounts/test/browser/accountPickerService.test.ts +++ b/src/sql/workbench/parts/accounts/test/browser/accountPickerService.test.ts @@ -6,10 +6,10 @@ import * as azdata from 'azdata'; import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; -import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; +import { EventVerifierSingle } from 'sql/base/test/common/event'; import { Emitter } from 'vs/base/common/event'; -import { AccountPicker } from 'sql/platform/accounts/browser/accountPickerImpl'; -import { AccountPickerService } from 'sql/platform/accounts/browser/accountPickerService'; +import { AccountPicker } from 'sql/workbench/parts/accounts/browser/accountPickerImpl'; +import { AccountPickerService } from 'sql/workbench/parts/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/platform/accounts/test/browser/autoOAuthDialogController.test.ts b/src/sql/workbench/parts/accounts/test/browser/autoOAuthDialogController.test.ts similarity index 97% rename from src/sql/platform/accounts/test/browser/autoOAuthDialogController.test.ts rename to src/sql/workbench/parts/accounts/test/browser/autoOAuthDialogController.test.ts index ca71d09fb5..c92d9bb460 100644 --- a/src/sql/platform/accounts/test/browser/autoOAuthDialogController.test.ts +++ b/src/sql/workbench/parts/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/platform/accounts/browser/autoOAuthDialog'; -import { AutoOAuthDialogController } from 'sql/platform/accounts/browser/autoOAuthDialogController'; +import { AutoOAuthDialog } from 'sql/workbench/parts/accounts/browser/autoOAuthDialog'; +import { AutoOAuthDialogController } from 'sql/workbench/parts/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/platform/accounts/test/browser/firewallRuleDialogController.test.ts b/src/sql/workbench/parts/accounts/test/browser/firewallRuleDialogController.test.ts similarity index 98% rename from src/sql/platform/accounts/test/browser/firewallRuleDialogController.test.ts rename to src/sql/workbench/parts/accounts/test/browser/firewallRuleDialogController.test.ts index be08d35571..712a4ae617 100644 --- a/src/sql/platform/accounts/test/browser/firewallRuleDialogController.test.ts +++ b/src/sql/workbench/parts/accounts/test/browser/firewallRuleDialogController.test.ts @@ -7,9 +7,9 @@ import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import { Emitter, Event } from 'vs/base/common/event'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { FirewallRuleDialog } from 'sql/platform/accounts/browser/firewallRuleDialog'; +import { FirewallRuleDialog } from 'sql/workbench/parts/accounts/browser/firewallRuleDialog'; import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel'; -import { FirewallRuleDialogController } from 'sql/platform/accounts/browser/firewallRuleDialogController'; +import { FirewallRuleDialogController } from 'sql/workbench/parts/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.module.ts b/src/sql/workbench/parts/backup/browser/backup.module.ts index 9664f74487..e1585e2df0 100644 --- a/src/sql/workbench/parts/backup/browser/backup.module.ts +++ b/src/sql/workbench/parts/backup/browser/backup.module.ts @@ -11,11 +11,11 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; -import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { BackupComponent } from 'sql/workbench/parts/backup/browser/backup.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; // Backup wizard main angular module export const BackupModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { diff --git a/src/sql/workbench/parts/backup/browser/backupDialog.ts b/src/sql/workbench/parts/backup/browser/backupDialog.ts index 0584b6c9ee..989283c0ea 100644 --- a/src/sql/workbench/parts/backup/browser/backupDialog.ts +++ b/src/sql/workbench/parts/backup/browser/backupDialog.ts @@ -14,7 +14,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; 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 { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { append, $ } from 'vs/base/browser/dom'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts b/src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts index 5d8b2279be..82b4bd0329 100644 --- a/src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts +++ b/src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts @@ -19,7 +19,7 @@ import { TestConnectionManagementService } from 'sql/platform/connection/test/co import { ICommandService } from 'vs/platform/commands/common/commands'; import { TestCommandService } from 'vs/editor/test/browser/editorTestServices'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { assertThrowsAsync } from 'sqltest/utils/testUtils'; +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'; diff --git a/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts b/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts index dd42d86444..4e804365ef 100644 --- a/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts +++ b/src/sql/workbench/parts/connection/common/connectionProviderExtension.ts @@ -10,15 +10,8 @@ import { localize } from 'vs/nls'; import { Event, Emitter } from 'vs/base/common/event'; import { deepClone } from 'vs/base/common/objects'; -import * as azdata from 'azdata'; import * as resources from 'vs/base/common/resources'; - - -export interface ConnectionProviderProperties { - providerId: string; - displayName: string; - connectionOptions: azdata.ConnectionOption[]; -} +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; export const Extensions = { ConnectionProviderContributions: 'connection.providers' diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts b/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts index 613270af23..a22be89613 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/containers/dashboardGridContainer.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./dashboardGridContainer'; import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, ContentChild } from '@angular/core'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; diff --git a/src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component.ts b/src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component.ts index f7c5719864..94ec9397db 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/containers/dashboardHomeContainer.component.ts @@ -10,8 +10,8 @@ import { Component, forwardRef, Input, ChangeDetectorRef, Inject, ViewChild, Con 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; -import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; +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 { 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/dashboardNavSection.component.ts b/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.ts index d3e69884e4..76e579f477 100644 --- a/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/containers/dashboardNavSection.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./dashboardNavSection'; import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, OnChanges, AfterContentInit } from '@angular/core'; -import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/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'; diff --git a/src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.ts b/src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.ts index 2c8a949463..081e0e3162 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/contents/controlHostContent.component.ts @@ -9,7 +9,7 @@ import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef, Elemen import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import * as azdata from 'azdata'; import { memoize } from 'vs/base/common/decorators'; diff --git a/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts b/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts index de8897ed6b..0b077479c6 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/contents/dashboardWidgetWrapper.component.ts @@ -24,7 +24,7 @@ import { TasksWidget } from 'sql/workbench/parts/dashboard/browser/widgets/tasks 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; diff --git a/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts b/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts index d11658e927..7c78472133 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts @@ -12,7 +12,7 @@ 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.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/widgetContent.component.ts b/src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.ts index 83c74d6c99..fec4643820 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/contents/widgetContent.component.ts @@ -9,7 +9,7 @@ import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryLis import { NgGridConfig, NgGrid, NgGridItem } from 'angular2-grid'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.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 { subscriptionToDisposable, AngularDisposable } from 'sql/base/browser/lifecycle'; diff --git a/src/sql/workbench/parts/dashboard/browser/core/actions.ts b/src/sql/workbench/parts/dashboard/browser/core/actions.ts index a65375846b..93c400a059 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/actions.ts +++ b/src/sql/workbench/parts/dashboard/browser/core/actions.ts @@ -8,9 +8,9 @@ import * as nls from 'vs/nls'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/common/angularEventingService'; +import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/browser/angularEventingService'; import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; -import { IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; import { subscriptionToDisposable } from 'sql/base/browser/lifecycle'; export class EditDashboardAction extends Action { diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts b/src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts index 98a5f3532c..291a48dabe 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts +++ b/src/sql/workbench/parts/dashboard/browser/core/dashboardHelper.ts @@ -20,7 +20,7 @@ import { MODELVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/browser/conta 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 { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import * as Constants from 'sql/platform/connection/common/constants'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts b/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts index 2d0259352e..6beb23dadd 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/core/dashboardPage.component.ts @@ -9,14 +9,14 @@ import 'sql/workbench/parts/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 { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.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 { PanelComponent } from 'sql/base/browser/ui/panel/panel.component'; -import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry'; +import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/workbench/parts/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/common/angularEventingService'; +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'; diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts b/src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts index dc2ee4d08b..dc9b456616 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts +++ b/src/sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution.ts @@ -9,7 +9,7 @@ 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/platform/dashboard/browser/dashboardRegistry'; +import { registerTab } from 'sql/workbench/parts/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'; diff --git a/src/sql/workbench/parts/dashboard/browser/core/dashboardWidget.ts b/src/sql/workbench/parts/dashboard/browser/core/dashboardWidget.ts index b8b164129c..e8da15f94c 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/dashboardWidget.ts +++ b/src/sql/workbench/parts/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/platform/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; export interface IDashboardWidget { actions: Array; diff --git a/src/sql/workbench/parts/dashboard/browser/core/interfaces.ts b/src/sql/workbench/parts/dashboard/browser/core/interfaces.ts index 7831e8bc19..6bbbeb5577 100644 --- a/src/sql/workbench/parts/dashboard/browser/core/interfaces.ts +++ b/src/sql/workbench/parts/dashboard/browser/core/interfaces.ts @@ -9,7 +9,7 @@ import { Event } from 'vs/base/common/event'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; export abstract class DashboardTab extends TabChild implements OnDestroy { public abstract layout(): void; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.component.ts b/src/sql/workbench/parts/dashboard/browser/dashboard.component.ts index f49e5642f4..7aaab9d091 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboard.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/dashboard.component.ts @@ -8,7 +8,7 @@ import 'vs/css!./dashboard'; import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.module.ts b/src/sql/workbench/parts/dashboard/browser/dashboard.module.ts index 4da0b242cd..7ce4f250cc 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboard.module.ts +++ b/src/sql/workbench/parts/dashboard/browser/dashboard.module.ts @@ -14,8 +14,8 @@ import { ChartsModule } from 'ng2-charts'; import CustomUrlSerializer from 'sql/base/browser/urlSerializer'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry'; import { Extensions as ComponentExtensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry'; -import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; -import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; +import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -27,7 +27,7 @@ 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; /* Directives */ import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts b/src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts index 19b0a00a94..bdf5493c7c 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts +++ b/src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts @@ -13,8 +13,8 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { DashboardInput } from './dashboardInput'; import { DashboardModule } from './dashboard.module'; -import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; -import { IDashboardComponentParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +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 { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; diff --git a/src/sql/platform/dashboard/browser/dashboardRegistry.ts b/src/sql/workbench/parts/dashboard/browser/dashboardRegistry.ts similarity index 100% rename from src/sql/platform/dashboard/browser/dashboardRegistry.ts rename to src/sql/workbench/parts/dashboard/browser/dashboardRegistry.ts diff --git a/src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts index 2442eb6142..db76120df3 100644 --- a/src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.component.ts @@ -10,8 +10,8 @@ import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/browser/services/ 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; -import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; +import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as nls from 'vs/nls'; diff --git a/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts index e15f847067..9d568a519e 100644 --- a/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.component.ts @@ -10,8 +10,8 @@ import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/browser/services/ 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; -import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; +import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as nls from 'vs/nls'; diff --git a/src/sql/workbench/parts/dashboard/browser/services/breadcrumb.service.ts b/src/sql/workbench/parts/dashboard/browser/services/breadcrumb.service.ts index 24280c82cb..bbc32f6d6d 100644 --- a/src/sql/workbench/parts/dashboard/browser/services/breadcrumb.service.ts +++ b/src/sql/workbench/parts/dashboard/browser/services/breadcrumb.service.ts @@ -7,7 +7,7 @@ import { Injectable, forwardRef, Inject } from '@angular/core'; import { Subject } from 'rxjs/Subject'; import { DashboardServiceInterface } from './dashboardServiceInterface.service'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { MenuItem, IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service.ts b/src/sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service.ts index 35dd591a63..e15355f0c3 100644 --- a/src/sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service.ts +++ b/src/sql/workbench/parts/dashboard/browser/services/dashboardServiceInterface.service.ts @@ -8,15 +8,15 @@ import { Injectable, Inject, forwardRef } from '@angular/core'; import { Router } from '@angular/router'; /* SQL imports */ -import { IDashboardComponentParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IDashboardComponentParams, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; 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/common/angularEventingService'; -import { IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry'; +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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; /* VS imports */ import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts index 0b6e152e2a..43c5d2b49e 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { MetadataType } from 'sql/platform/connection/common/connectionManagement'; -import { SingleConnectionManagementService, CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { SingleConnectionManagementService, CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ManageActionContext, BaseActionContext } from 'sql/workbench/browser/actions'; import * as tree from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts index 8070b07d4d..00935fbf66 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts @@ -5,7 +5,7 @@ import { ManageAction, ManageActionContext } from 'sql/workbench/browser/actions'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; +import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; export class ExplorerManageAction extends ManageAction { diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts index 183354a40e..49411c895b 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerWidget.component.ts @@ -11,7 +11,7 @@ import { Component, Inject, forwardRef, OnInit, ViewChild, ElementRef } from '@a import { Router } from '@angular/router'; import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts b/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts index ce2bccbaff..58947cf2c0 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/insights/insightsWidget.component.ts @@ -10,7 +10,7 @@ import { import { Observable } from 'rxjs/Observable'; import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ComponentHostDirective } from 'sql/workbench/parts/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'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.ts b/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.ts index 3ce499af09..d0b06d1bc1 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/properties/propertiesWidget.component.ts @@ -6,9 +6,9 @@ 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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/platform/dashboard/browser/dashboardRegistry'; +import { IDashboardRegistry, Extensions as DashboardExtensions } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; import { DatabaseInfo, ServerInfo } from 'azdata'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.ts b/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.ts index 504cdce0c6..71bdd12fef 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.component.ts @@ -11,7 +11,7 @@ import { Component, Inject, forwardRef, ViewChild, OnInit, ElementRef } from '@a /* SQL imports */ import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/browser/core/dashboardWidget'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; /* VS imports */ diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts b/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts index e19f273086..c41cbabb39 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts @@ -11,7 +11,7 @@ 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewService'; import * as azdata from 'azdata'; diff --git a/src/sql/workbench/parts/dashboard/test/electron-browser/propertiesWidget.component.test.ts b/src/sql/workbench/parts/dashboard/test/electron-browser/propertiesWidget.component.test.ts index f3947f0796..25552c59c2 100644 --- a/src/sql/workbench/parts/dashboard/test/electron-browser/propertiesWidget.component.test.ts +++ b/src/sql/workbench/parts/dashboard/test/electron-browser/propertiesWidget.component.test.ts @@ -9,7 +9,7 @@ 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 { SingleAdminService, SingleConnectionManagementService } from 'sql/platform/bootstrap/browser/commonServiceInterface.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 { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; diff --git a/src/sql/workbench/parts/editData/browser/editData.component.ts b/src/sql/workbench/parts/editData/browser/editData.component.ts index 068e70a0ca..2ef8158c30 100644 --- a/src/sql/workbench/parts/editData/browser/editData.component.ts +++ b/src/sql/workbench/parts/editData/browser/editData.component.ts @@ -10,7 +10,7 @@ import { VirtualizedCollection } from 'angular2-slickgrid'; import { IGridDataSet } from 'sql/workbench/parts/grid/common/interfaces'; import * as Services from 'sql/base/browser/ui/table/formatters'; -import { IEditDataComponentParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +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 { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; diff --git a/src/sql/workbench/parts/editData/browser/editData.module.ts b/src/sql/workbench/parts/editData/browser/editData.module.ts index edfe73f65d..4186ae0d9a 100644 --- a/src/sql/workbench/parts/editData/browser/editData.module.ts +++ b/src/sql/workbench/parts/editData/browser/editData.module.ts @@ -10,10 +10,10 @@ import { BrowserModule } from '@angular/platform-browser'; import { SlickGrid } from 'angular2-slickgrid'; import { EditDataComponent } from 'sql/workbench/parts/editData/browser/editData.component'; -import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export const EditDataModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { diff --git a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts b/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts index fb45105dd1..b1f23ba098 100644 --- a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts +++ b/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts @@ -15,9 +15,9 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import * as types from 'vs/base/common/types'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { BareResultsGridInfo } from 'sql/workbench/parts/query/browser/queryResultsEditor'; -import { IEditDataComponentParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +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'; diff --git a/src/sql/workbench/parts/jobManagement/browser/alertsView.component.ts b/src/sql/workbench/parts/jobManagement/browser/alertsView.component.ts index 76714ae426..09512882d3 100644 --- a/src/sql/workbench/parts/jobManagement/browser/alertsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/alertsView.component.ts @@ -15,7 +15,7 @@ import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/ag import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/browser/jobActions'; import { JobManagementView, JobActionContext } from 'sql/workbench/parts/jobManagement/browser/jobManagementView'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; import { IAction } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts b/src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts index b7ebd72397..976b255cd3 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts @@ -11,7 +11,7 @@ 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities'; diff --git a/src/sql/workbench/parts/jobManagement/browser/jobManagementView.ts b/src/sql/workbench/parts/jobManagement/browser/jobManagementView.ts index 629078b158..ced1e2f38d 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobManagementView.ts +++ b/src/sql/workbench/parts/jobManagement/browser/jobManagementView.ts @@ -7,7 +7,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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.ts b/src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.ts index 6b12b717f3..2e0d868ca9 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/jobStepsView.component.ts @@ -11,7 +11,7 @@ import { attachListStyler } from 'vs/platform/theme/common/styler'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { JobStepsViewController, JobStepsViewDataSource, JobStepsViewFilter, JobStepsViewRenderer, JobStepsViewModel diff --git a/src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts b/src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts index f6f31b1a20..1442511ad7 100644 --- a/src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts @@ -19,7 +19,7 @@ import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobMa 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.ts b/src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.ts index e7930ddb9c..f1c77123ae 100644 --- a/src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/notebookHistory.component.ts @@ -11,7 +11,7 @@ import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable, PipeTransform, Pipe } from '@angular/core'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/agentView.component'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { RunJobAction, StopJobAction, JobsRefreshAction, EditNotebookJobAction, EditJobAction, OpenMaterializedNotebookAction, OpenTemplateNotebookAction, RenameNotebookMaterializedAction, PinNotebookMaterializedAction, UnpinNotebookMaterializedAction, DeleteMaterializedNotebookAction } from 'sql/platform/jobManagement/browser/jobActions'; import { NotebookCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities'; diff --git a/src/sql/workbench/parts/jobManagement/browser/notebooksView.component.ts b/src/sql/workbench/parts/jobManagement/browser/notebooksView.component.ts index ab71d572f5..a9139bcb5c 100644 --- a/src/sql/workbench/parts/jobManagement/browser/notebooksView.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/notebooksView.component.ts @@ -19,7 +19,7 @@ import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobMa 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/workbench/parts/jobManagement/browser/operatorsView.component.ts b/src/sql/workbench/parts/jobManagement/browser/operatorsView.component.ts index a209d21718..23cc0cbc57 100644 --- a/src/sql/workbench/parts/jobManagement/browser/operatorsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/operatorsView.component.ts @@ -14,7 +14,7 @@ import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/ag 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/jobManagement/browser/proxiesView.component.ts b/src/sql/workbench/parts/jobManagement/browser/proxiesView.component.ts index 9f3222ef2e..c831dee556 100644 --- a/src/sql/workbench/parts/jobManagement/browser/proxiesView.component.ts +++ b/src/sql/workbench/parts/jobManagement/browser/proxiesView.component.ts @@ -13,7 +13,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/parts/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/platform/bootstrap/browser/commonServiceInterface.service'; +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 { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.ts b/src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.ts index 48dfa2f178..7b6534cb27 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/textCell.component.ts @@ -27,7 +27,7 @@ import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInt 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 { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; export const TEXT_SELECTOR: string = 'text-cell-component'; diff --git a/src/sql/workbench/parts/notebook/browser/notebook.component.ts b/src/sql/workbench/parts/notebook/browser/notebook.component.ts index cf7213b0b4..de4a75b1e9 100644 --- a/src/sql/workbench/parts/notebook/browser/notebook.component.ts +++ b/src/sql/workbench/parts/notebook/browser/notebook.component.ts @@ -52,7 +52,7 @@ import { LabeledMenuItemActionItem, fillInActions } from 'vs/platform/actions/br import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { Button } from 'sql/base/browser/ui/button/button'; import { isUndefinedOrNull } from 'vs/base/common/types'; -import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; import { getErrorMessage } from 'vs/base/common/errors'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; diff --git a/src/sql/workbench/parts/notebook/browser/notebook.module.ts b/src/sql/workbench/parts/notebook/browser/notebook.module.ts index cc1ffe3790..f63b76c937 100644 --- a/src/sql/workbench/parts/notebook/browser/notebook.module.ts +++ b/src/sql/workbench/parts/notebook/browser/notebook.module.ts @@ -9,8 +9,8 @@ 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 { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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 { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -27,7 +27,7 @@ import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; import { IMimeComponentRegistry, Extensions } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; import { LinkHandlerDirective } from 'sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive'; -import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams'; +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'; diff --git a/src/sql/workbench/parts/notebook/browser/notebookEditor.ts b/src/sql/workbench/parts/notebook/browser/notebookEditor.ts index ad46ffe55a..624e5cb926 100644 --- a/src/sql/workbench/parts/notebook/browser/notebookEditor.ts +++ b/src/sql/workbench/parts/notebook/browser/notebookEditor.ts @@ -7,7 +7,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { EditorOptions } from 'vs/workbench/common/editor'; import * as DOM from 'vs/base/browser/dom'; -import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { CancellationToken } from 'vs/base/common/cancellation'; diff --git a/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts b/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts index 55363b6f3f..f468aabc83 100644 --- a/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts +++ b/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts @@ -8,7 +8,7 @@ import * as os from 'os'; import * as assert from 'assert'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +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'; diff --git a/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts b/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts index 1771a025f5..e54299c271 100644 --- a/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts +++ b/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts @@ -9,7 +9,7 @@ import * as assert from 'assert'; 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 '../../../../../../sqltest/utils/testUtils'; +import * as testUtils from '../../../../../base/test/common/async'; import { CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { TestFileService } from 'vs/workbench/test/workbenchTestServices'; diff --git a/src/sql/workbench/parts/objectExplorer/test/browser/serverTreeView.test.ts b/src/sql/workbench/parts/objectExplorer/test/browser/serverTreeView.test.ts index 05ea7c0eee..c3228e19a4 100644 --- a/src/sql/workbench/parts/objectExplorer/test/browser/serverTreeView.test.ts +++ b/src/sql/workbench/parts/objectExplorer/test/browser/serverTreeView.test.ts @@ -5,7 +5,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module.ts b/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module.ts index 0a4d908501..3e52c84bac 100644 --- a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module.ts +++ b/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.module.ts @@ -9,13 +9,13 @@ import { forwardRef, NgModule, ComponentFactoryResolver, Inject, ApplicationRef import { FormsModule } from '@angular/forms'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { WizardNavigation } from 'sql/platform/dialog/browser/wizardNavigation.component'; +import { WizardNavigation } from 'sql/workbench/services/dialog/browser/wizardNavigation.component'; 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 { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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 { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; @@ -24,7 +24,7 @@ import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Registry } from 'vs/platform/registry/common/platform'; -import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export const QueryModelViewTabModule = (params, selector: string, instantiationService: IInstantiationService): any => { diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.ts b/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.ts index f683e65677..bb7521efc7 100644 --- a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.ts +++ b/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab.ts @@ -7,7 +7,7 @@ import { Dimension } from 'vs/base/browser/dom'; 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/platform/bootstrap/browser/bootstrapService'; +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'; diff --git a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTabContainer.component.ts b/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTabContainer.component.ts index 073ce5ebd1..d15abc3fbe 100644 --- a/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTabContainer.component.ts +++ b/src/sql/workbench/parts/query/browser/modelViewTab/queryModelViewTabContainer.component.ts @@ -6,10 +6,10 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; -import { DialogPane } from 'sql/platform/dialog/browser/dialogPane'; +import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; import { ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; -import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export interface LayoutRequestParams { modelViewId?: string; diff --git a/src/sql/workbench/parts/query/test/browser/queryActions.test.ts b/src/sql/workbench/parts/query/test/browser/queryActions.test.ts index d23ff7d024..00214cafbe 100644 --- a/src/sql/workbench/parts/query/test/browser/queryActions.test.ts +++ b/src/sql/workbench/parts/query/test/browser/queryActions.test.ts @@ -22,7 +22,7 @@ import { import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; import { QueryEditor } from 'sql/workbench/parts/query/browser/queryEditor'; import { QueryModelService } from 'sql/platform/query/common/queryModelService'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as TypeMoq from 'typemoq'; diff --git a/src/sql/workbench/parts/query/test/browser/queryEditor.test.ts b/src/sql/workbench/parts/query/test/browser/queryEditor.test.ts index 950575b53f..e71e478455 100644 --- a/src/sql/workbench/parts/query/test/browser/queryEditor.test.ts +++ b/src/sql/workbench/parts/query/test/browser/queryEditor.test.ts @@ -13,7 +13,7 @@ import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResults import { QueryModelService } from 'sql/platform/query/common/queryModelService'; import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { RunQueryAction, ListDatabasesActionItem } from 'sql/workbench/parts/query/browser/queryActions'; import { EditorDescriptorService } from 'sql/workbench/services/queryEditor/browser/editorDescriptorService'; diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlan.component.ts b/src/sql/workbench/parts/queryPlan/browser/queryPlan.component.ts index de911c5a42..8d6ed8ae9c 100644 --- a/src/sql/workbench/parts/queryPlan/browser/queryPlan.component.ts +++ b/src/sql/workbench/parts/queryPlan/browser/queryPlan.component.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/qp'; import { ElementRef, Component, Inject, forwardRef, OnDestroy, OnInit, ViewChild } from '@angular/core'; import * as QP from 'html-query-plan'; -import { IQueryPlanParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IQueryPlanParams, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { registerThemingParticipant, ICssStyleCollector, ITheme } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlan.module.ts b/src/sql/workbench/parts/queryPlan/browser/queryPlan.module.ts index 62eef4a2ad..b0204b81b2 100644 --- a/src/sql/workbench/parts/queryPlan/browser/queryPlan.module.ts +++ b/src/sql/workbench/parts/queryPlan/browser/queryPlan.module.ts @@ -7,11 +7,11 @@ import { NgModule, Inject, forwardRef, ApplicationRef, ComponentFactoryResolver, import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { providerIterator } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { QueryPlanComponent } from 'sql/workbench/parts/queryPlan/browser/queryPlan.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; // Connection Dashboard main angular module export const QueryPlanModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { diff --git a/src/sql/workbench/parts/queryPlan/browser/queryPlanEditor.ts b/src/sql/workbench/parts/queryPlan/browser/queryPlanEditor.ts index 17996b6611..8f537ecb5e 100644 --- a/src/sql/workbench/parts/queryPlan/browser/queryPlanEditor.ts +++ b/src/sql/workbench/parts/queryPlan/browser/queryPlanEditor.ts @@ -11,8 +11,8 @@ 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 { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; -import { IQueryPlanParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +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 { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts index f95b0abd6e..d7492828e6 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/platform/accounts/browser/accountDialogController'; -import { AutoOAuthDialogController } from 'sql/platform/accounts/browser/autoOAuthDialogController'; +import { AccountDialogController } from 'sql/workbench/parts/accounts/browser/accountDialogController'; +import { AutoOAuthDialogController } from 'sql/workbench/parts/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 05dd0e686b..7b6c2aef81 100644 --- a/src/sql/workbench/services/accountManagement/test/browser/accountManagementService.test.ts +++ b/src/sql/workbench/services/accountManagement/test/browser/accountManagementService.test.ts @@ -7,14 +7,14 @@ 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/platform/accounts/browser/accountDialogController'; +import { AccountDialogController } from 'sql/workbench/parts/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'; import { AccountProviderStub } from 'sql/platform/accounts/test/common/testAccountManagementService'; -import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; import { TestStorageService } from 'vs/workbench/test/workbenchTestServices'; +import { EventVerifierSingle } from 'sql/base/test/common/event'; // SUITE CONSTANTS ///////////////////////////////////////////////////////// const hasAccountProvider: azdata.AccountProviderMetadata = { diff --git a/src/sql/platform/bootstrap/browser/bootstrapService.ts b/src/sql/workbench/services/bootstrap/browser/bootstrapService.ts similarity index 95% rename from src/sql/platform/bootstrap/browser/bootstrapService.ts rename to src/sql/workbench/services/bootstrap/browser/bootstrapService.ts index c49edb591b..de198dd358 100644 --- a/src/sql/platform/bootstrap/browser/bootstrapService.ts +++ b/src/sql/workbench/services/bootstrap/browser/bootstrapService.ts @@ -9,7 +9,7 @@ import { IInstantiationService, _util } from 'vs/platform/instantiation/common/i import { IEditorInput } from 'vs/workbench/common/editor'; import { Trace } from 'vs/platform/instantiation/common/instantiationService'; import { values } from 'vs/base/common/map'; -import { IModuleFactory, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IModuleFactory, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; const selectorCounter = new Map(); diff --git a/src/sql/platform/bootstrap/browser/commonServiceInterface.service.ts b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts similarity index 98% rename from src/sql/platform/bootstrap/browser/commonServiceInterface.service.ts rename to src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts index 9b54595fa3..c4a337e155 100644 --- a/src/sql/platform/bootstrap/browser/commonServiceInterface.service.ts +++ b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts @@ -8,7 +8,7 @@ import { Injectable, Inject } from '@angular/core'; import { Observable } from 'rxjs/Observable'; /* SQL imports */ -import { IDefaultComponentParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IDefaultComponentParams, IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; diff --git a/src/sql/platform/bootstrap/common/bootstrapParams.ts b/src/sql/workbench/services/bootstrap/common/bootstrapParams.ts similarity index 100% rename from src/sql/platform/bootstrap/common/bootstrapParams.ts rename to src/sql/workbench/services/bootstrap/common/bootstrapParams.ts diff --git a/src/sql/platform/capabilities/common/capabilitiesServiceImpl.ts b/src/sql/workbench/services/capabilities/common/capabilitiesServiceImpl.ts similarity index 95% rename from src/sql/platform/capabilities/common/capabilitiesServiceImpl.ts rename to src/sql/workbench/services/capabilities/common/capabilitiesServiceImpl.ts index 98ab6a1ad1..57559a3bba 100644 --- a/src/sql/platform/capabilities/common/capabilitiesServiceImpl.ts +++ b/src/sql/workbench/services/capabilities/common/capabilitiesServiceImpl.ts @@ -15,8 +15,8 @@ import * as azdata from 'azdata'; import { entries } from 'sql/base/common/objects'; import { toObject } from 'sql/base/common/map'; -import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions as ConnectionExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; -import { ICapabilitiesService, ProviderFeatures, clientCapabilities } from 'sql/platform/capabilities/common/capabilitiesService'; +import { IConnectionProviderRegistry, Extensions as ConnectionExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { ICapabilitiesService, ProviderFeatures, clientCapabilities, ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; const connectionRegistry = Registry.as(ConnectionExtensions.ConnectionProviderContributions); diff --git a/src/sql/workbench/services/connection/browser/cmsConnectionController.ts b/src/sql/workbench/services/connection/browser/cmsConnectionController.ts index 5922f9cfa5..00acb2595f 100644 --- a/src/sql/workbench/services/connection/browser/cmsConnectionController.ts +++ b/src/sql/workbench/services/connection/browser/cmsConnectionController.ts @@ -6,11 +6,11 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionComponentCallbacks } from 'sql/workbench/services/connection/browser/connectionDialogService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import { ConnectionController } from 'sql/workbench/services/connection/browser/connectionController'; import { CmsConnectionWidget } from 'sql/workbench/services/connection/browser/cmsConnectionWidget'; import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController'; import { ILogService } from 'vs/platform/log/common/log'; +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; /** * Connection Controller for CMS Connections diff --git a/src/sql/workbench/services/connection/browser/connectionController.ts b/src/sql/workbench/services/connection/browser/connectionController.ts index 4890d9a92c..d88bd4c466 100644 --- a/src/sql/workbench/services/connection/browser/connectionController.ts +++ b/src/sql/workbench/services/connection/browser/connectionController.ts @@ -13,10 +13,10 @@ import * as azdata from 'azdata'; import * as Utils from 'sql/platform/connection/common/utils'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import { ConnectionWidget } from 'sql/workbench/services/connection/browser/connectionWidget'; import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController'; import { ILogService } from 'vs/platform/log/common/log'; +import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; export class ConnectionController implements IConnectionComponentController { private _advancedController: AdvancedPropertiesController; diff --git a/src/sql/platform/connection/browser/connectionManagementService.ts b/src/sql/workbench/services/connection/browser/connectionManagementService.ts similarity index 99% rename from src/sql/platform/connection/browser/connectionManagementService.ts rename to src/sql/workbench/services/connection/browser/connectionManagementService.ts index 83199a8e5d..e7becc90e9 100644 --- a/src/sql/platform/connection/browser/connectionManagementService.ts +++ b/src/sql/workbench/services/connection/browser/connectionManagementService.ts @@ -14,7 +14,7 @@ import { ConnectionStore } from 'sql/platform/connection/common/connectionStore' import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as Utils from 'sql/platform/connection/common/utils'; import * as Constants from 'sql/platform/connection/common/constants'; -import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ICapabilitiesService, ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; import * as ConnectionContracts from 'sql/workbench/parts/connection/common/connection'; import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput'; @@ -22,12 +22,12 @@ import { ConnectionGlobalStatus } from 'sql/workbench/parts/connection/common/co import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities'; import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; -import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; +import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; import * as QueryConstants from 'sql/workbench/parts/query/common/constants'; import { Deferred } from 'sql/base/common/promise'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { values, entries } from 'sql/base/common/objects'; -import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import { IAccountManagementService, AzureResource } from 'sql/platform/accounts/common/interfaces'; import * as azdata from 'azdata'; @@ -35,7 +35,7 @@ import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as errors from 'vs/base/common/errors'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import * as platform from 'vs/platform/registry/common/platform'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts b/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts index 2c29f29c9a..bea6f38db0 100644 --- a/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts +++ b/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts @@ -5,7 +5,7 @@ import { ConnectionDialogService } from 'sql/workbench/services/connection/browser/connectionDialogService'; import { ConnectionDialogWidget } from 'sql/workbench/services/connection/browser/connectionDialogWidget'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { ConnectionType, IConnectableInput, IConnectionResult, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/testErrorMessageService'; diff --git a/src/sql/platform/connection/test/browser/connectionManagementService.test.ts b/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts similarity index 99% rename from src/sql/platform/connection/test/browser/connectionManagementService.test.ts rename to src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts index f316c4bdbd..dffde039ca 100644 --- a/src/sql/platform/connection/test/browser/connectionManagementService.test.ts +++ b/src/sql/workbench/services/connection/test/browser/connectionManagementService.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { TestConnectionDialogService } from 'sql/workbench/services/connection/test/common/testConnectionDialogService'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; import { diff --git a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialog.ts index 94b451a6fd..360f8bd538 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/platform/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/parts/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 e9bac02fc5..8d406d5203 100644 --- a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts @@ -23,7 +23,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/platform/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/parts/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 5762ddb446..4dc7a58e5f 100644 --- a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogService.ts @@ -5,8 +5,8 @@ import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; import { NewDashboardTabDialog } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl'; -import { IDashboardTab } from 'sql/platform/dashboard/browser/dashboardRegistry'; -import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; +import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; +import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; import { IDashboardUITab } from 'sql/workbench/services/dashboard/browser/newDashboardTabViewModel'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/services/dashboard/browser/newDashboardTabViewModel.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabViewModel.ts index 89ea86fb5f..83e08dc14a 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/platform/dashboard/browser/dashboardRegistry'; +import { IDashboardTab } from 'sql/workbench/parts/dashboard/browser/dashboardRegistry'; export interface IDashboardUITab { diff --git a/src/sql/platform/dialog/browser/customDialogService.ts b/src/sql/workbench/services/dialog/browser/customDialogService.ts similarity index 88% rename from src/sql/platform/dialog/browser/customDialogService.ts rename to src/sql/workbench/services/dialog/browser/customDialogService.ts index 920320e7ed..abf75b10a6 100644 --- a/src/sql/platform/dialog/browser/customDialogService.ts +++ b/src/sql/workbench/services/dialog/browser/customDialogService.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DialogModal } from 'sql/platform/dialog/browser/dialogModal'; -import { WizardModal } from 'sql/platform/dialog/browser/wizardModal'; -import { Dialog, Wizard } from 'sql/platform/dialog/common/dialogTypes'; +import { DialogModal } from 'sql/workbench/services/dialog/browser/dialogModal'; +import { WizardModal } from 'sql/workbench/services/dialog/browser/wizardModal'; +import { Dialog, Wizard } from 'sql/workbench/services/dialog/common/dialogTypes'; import { IModalOptions } from 'sql/workbench/browser/modal/modal'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/platform/dialog/browser/dialog.module.ts b/src/sql/workbench/services/dialog/browser/dialog.module.ts similarity index 85% rename from src/sql/platform/dialog/browser/dialog.module.ts rename to src/sql/workbench/services/dialog/browser/dialog.module.ts index 22d837f87b..1360ae784c 100644 --- a/src/sql/platform/dialog/browser/dialog.module.ts +++ b/src/sql/workbench/services/dialog/browser/dialog.module.ts @@ -10,14 +10,14 @@ import { FormsModule } from '@angular/forms'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { DialogContainer } from 'sql/platform/dialog/browser/dialogContainer.component'; -import { WizardNavigation } from 'sql/platform/dialog/browser/wizardNavigation.component'; +import { DialogContainer } from 'sql/workbench/services/dialog/browser/dialogContainer.component'; +import { WizardNavigation } from 'sql/workbench/services/dialog/browser/wizardNavigation.component'; 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 { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; +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 { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component'; @@ -25,7 +25,7 @@ import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Registry } from 'vs/platform/registry/common/platform'; -import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams, ISelector } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export const DialogModule = (params, selector: string, instantiationService: IInstantiationService): any => { diff --git a/src/sql/platform/dialog/browser/dialogContainer.component.ts b/src/sql/workbench/services/dialog/browser/dialogContainer.component.ts similarity index 94% rename from src/sql/platform/dialog/browser/dialogContainer.component.ts rename to src/sql/workbench/services/dialog/browser/dialogContainer.component.ts index e9913ee556..5dce670fc2 100644 --- a/src/sql/platform/dialog/browser/dialogContainer.component.ts +++ b/src/sql/workbench/services/dialog/browser/dialogContainer.component.ts @@ -6,10 +6,10 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; -import { DialogPane } from 'sql/platform/dialog/browser/dialogPane'; +import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; import { ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; -import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export interface LayoutRequestParams { modelViewId?: string; diff --git a/src/sql/platform/dialog/browser/dialogModal.ts b/src/sql/workbench/services/dialog/browser/dialogModal.ts similarity index 97% rename from src/sql/platform/dialog/browser/dialogModal.ts rename to src/sql/workbench/services/dialog/browser/dialogModal.ts index 9e6d14d95d..b0ac5d9d58 100644 --- a/src/sql/platform/dialog/browser/dialogModal.ts +++ b/src/sql/workbench/services/dialog/browser/dialogModal.ts @@ -6,8 +6,8 @@ import 'vs/css!./media/dialogModal'; import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal'; import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; -import { Dialog, DialogButton } from 'sql/platform/dialog/common/dialogTypes'; -import { DialogPane } from 'sql/platform/dialog/browser/dialogPane'; +import { Dialog, DialogButton } from 'sql/workbench/services/dialog/common/dialogTypes'; +import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/sql/platform/dialog/browser/dialogPane.ts b/src/sql/workbench/services/dialog/browser/dialogPane.ts similarity index 95% rename from src/sql/platform/dialog/browser/dialogPane.ts rename to src/sql/workbench/services/dialog/browser/dialogPane.ts index caf9d6b395..dc3ce1cd33 100644 --- a/src/sql/platform/dialog/browser/dialogPane.ts +++ b/src/sql/workbench/services/dialog/browser/dialogPane.ts @@ -8,11 +8,11 @@ import 'vs/css!./media/dialogModal'; import { NgModuleRef } from '@angular/core'; import { IModalDialogStyles } from 'sql/workbench/browser/modal/modal'; -import { DialogTab } from 'sql/platform/dialog/common/dialogTypes'; +import { DialogTab } from 'sql/workbench/services/dialog/common/dialogTypes'; import { TabbedPanel } from 'sql/base/browser/ui/panel/panel'; -import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; -import { DialogModule } from 'sql/platform/dialog/browser/dialog.module'; -import { DialogComponentParams, LayoutRequestParams } from 'sql/platform/dialog/browser/dialogContainer.component'; +import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; +import { DialogModule } from 'sql/workbench/services/dialog/browser/dialog.module'; +import { DialogComponentParams, LayoutRequestParams } from 'sql/workbench/services/dialog/browser/dialogContainer.component'; import * as DOM from 'vs/base/browser/dom'; import { IThemable } from 'vs/platform/theme/common/styler'; diff --git a/src/sql/platform/dialog/browser/media/dialogModal.css b/src/sql/workbench/services/dialog/browser/media/dialogModal.css similarity index 100% rename from src/sql/platform/dialog/browser/media/dialogModal.css rename to src/sql/workbench/services/dialog/browser/media/dialogModal.css diff --git a/src/sql/platform/dialog/browser/media/loading.svg b/src/sql/workbench/services/dialog/browser/media/loading.svg similarity index 100% rename from src/sql/platform/dialog/browser/media/loading.svg rename to src/sql/workbench/services/dialog/browser/media/loading.svg diff --git a/src/sql/platform/dialog/browser/media/loading_inverse.svg b/src/sql/workbench/services/dialog/browser/media/loading_inverse.svg similarity index 100% rename from src/sql/platform/dialog/browser/media/loading_inverse.svg rename to src/sql/workbench/services/dialog/browser/media/loading_inverse.svg diff --git a/src/sql/platform/dialog/browser/media/wizardNavigation.css b/src/sql/workbench/services/dialog/browser/media/wizardNavigation.css similarity index 100% rename from src/sql/platform/dialog/browser/media/wizardNavigation.css rename to src/sql/workbench/services/dialog/browser/media/wizardNavigation.css diff --git a/src/sql/platform/dialog/browser/wizardModal.ts b/src/sql/workbench/services/dialog/browser/wizardModal.ts similarity index 96% rename from src/sql/platform/dialog/browser/wizardModal.ts rename to src/sql/workbench/services/dialog/browser/wizardModal.ts index c29f4b55f4..52e58f9a6b 100644 --- a/src/sql/platform/dialog/browser/wizardModal.ts +++ b/src/sql/workbench/services/dialog/browser/wizardModal.ts @@ -6,11 +6,11 @@ import 'vs/css!./media/dialogModal'; import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal'; import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; -import { Wizard, DialogButton, WizardPage } from 'sql/platform/dialog/common/dialogTypes'; -import { DialogPane } from 'sql/platform/dialog/browser/dialogPane'; -import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { Wizard, DialogButton, WizardPage } from 'sql/workbench/services/dialog/common/dialogTypes'; +import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; +import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { DialogModule } from 'sql/platform/dialog/browser/dialog.module'; +import { DialogModule } from 'sql/workbench/services/dialog/browser/dialog.module'; import { Button } from 'vs/base/browser/ui/button/button'; import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/sql/platform/dialog/browser/wizardNavigation.component.ts b/src/sql/workbench/services/dialog/browser/wizardNavigation.component.ts similarity index 97% rename from src/sql/platform/dialog/browser/wizardNavigation.component.ts rename to src/sql/workbench/services/dialog/browser/wizardNavigation.component.ts index 78e0bef697..84533d0c0c 100644 --- a/src/sql/platform/dialog/browser/wizardNavigation.component.ts +++ b/src/sql/workbench/services/dialog/browser/wizardNavigation.component.ts @@ -9,7 +9,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { Wizard } from '../common/dialogTypes'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme'; -import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export class WizardNavigationParams implements IBootstrapParams { wizard: Wizard; diff --git a/src/sql/platform/dialog/common/dialogTypes.ts b/src/sql/workbench/services/dialog/common/dialogTypes.ts similarity index 100% rename from src/sql/platform/dialog/common/dialogTypes.ts rename to src/sql/workbench/services/dialog/common/dialogTypes.ts diff --git a/src/sql/platform/dialog/test/electron-browser/dialogPane.test.ts b/src/sql/workbench/services/dialog/test/electron-browser/dialogPane.test.ts similarity index 92% rename from src/sql/platform/dialog/test/electron-browser/dialogPane.test.ts rename to src/sql/workbench/services/dialog/test/electron-browser/dialogPane.test.ts index 3c786d1c67..65d9926a5c 100644 --- a/src/sql/platform/dialog/test/electron-browser/dialogPane.test.ts +++ b/src/sql/workbench/services/dialog/test/electron-browser/dialogPane.test.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { Dialog, DialogTab } from 'sql/platform/dialog/common/dialogTypes'; -import { DialogPane } from 'sql/platform/dialog/browser/dialogPane'; -import { DialogComponentParams } from 'sql/platform/dialog/browser/dialogContainer.component'; -import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; +import { Dialog, DialogTab } from 'sql/workbench/services/dialog/common/dialogTypes'; +import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; +import { DialogComponentParams } from 'sql/workbench/services/dialog/browser/dialogContainer.component'; +import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; diff --git a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts index bd39aaeb2f..737a6226fc 100644 --- a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts +++ b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts @@ -5,7 +5,7 @@ import { InsightsDialogController } from 'sql/workbench/services/insights/browser/insightsDialogController'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; diff --git a/src/sql/workbench/services/notebook/browser/notebookService.ts b/src/sql/workbench/services/notebook/browser/notebookService.ts index c85022fdc5..fe237b5aed 100644 --- a/src/sql/workbench/services/notebook/browser/notebookService.ts +++ b/src/sql/workbench/services/notebook/browser/notebookService.ts @@ -15,7 +15,7 @@ import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/noteb 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 { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; +import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; export const SERVICE_ID = 'notebookService'; export const INotebookService = createDecorator(SERVICE_ID); diff --git a/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts index 8dc791b06a..022a175d65 100644 --- a/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts +++ b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts @@ -10,7 +10,7 @@ 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 * as TelemetryUtils from 'sql/platform/telemetry/common/telemetryUtilities'; -import { FirewallRuleDialogController } from 'sql/platform/accounts/browser/firewallRuleDialogController'; +import { FirewallRuleDialogController } from 'sql/workbench/parts/accounts/browser/firewallRuleDialogController'; import * as azdata from 'azdata'; import { invalidProvider } from 'sql/base/common/errors'; diff --git a/src/sql/workbench/test/electron-browser/api/exthostNotebook.test.ts b/src/sql/workbench/test/electron-browser/api/exthostNotebook.test.ts index b8078020d4..87291daf84 100644 --- a/src/sql/workbench/test/electron-browser/api/exthostNotebook.test.ts +++ b/src/sql/workbench/test/electron-browser/api/exthostNotebook.test.ts @@ -13,7 +13,7 @@ import { IMainContext } from 'vs/workbench/api/common/extHost.protocol'; import { ExtHostNotebook } from 'sql/workbench/api/common/extHostNotebook'; import { MainThreadNotebookShape } from 'sql/workbench/api/common/sqlExtHost.protocol'; -import * as testUtils from '../../../../../sqltest/utils/testUtils'; +import * as testUtils from '../../../../base/test/common/async'; import { INotebookManagerDetails } from 'sql/workbench/api/common/sqlExtHostTypes'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts b/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts index 640a67c25f..8a7be0acaf 100644 --- a/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts +++ b/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts @@ -8,8 +8,8 @@ import { Mock, It, Times } from 'typemoq'; import { MainThreadModelViewDialog } from 'sql/workbench/api/browser/mainThreadModelViewDialog'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { IModelViewButtonDetails, IModelViewTabDetails, IModelViewDialogDetails, IModelViewWizardPageDetails, IModelViewWizardDetails, DialogMessage, MessageLevel } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { CustomDialogService } from 'sql/platform/dialog/browser/customDialogService'; -import { Dialog, DialogTab, Wizard } from 'sql/platform/dialog/common/dialogTypes'; +import { CustomDialogService } from 'sql/workbench/services/dialog/browser/customDialogService'; +import { Dialog, DialogTab, Wizard } from 'sql/workbench/services/dialog/common/dialogTypes'; import { ExtHostModelViewDialogShape } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index c6a25c35d8..3c7eefd0d6 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -126,7 +126,7 @@ registerSingleton(IOpenerService, OpenerService, true); //#region -- sql services import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ConnectionManagementService } from 'sql/platform/connection/browser/connectionManagementService'; +import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/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'; @@ -134,7 +134,7 @@ import { ErrorMessageService } from 'sql/workbench/services/errorMessage/browser import { ServerGroupController } from 'sql/workbench/services/serverGroup/browser/serverGroupController'; import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesServiceImpl'; +import { CapabilitiesService } from 'sql/workbench/services/capabilities/common/capabilitiesServiceImpl'; import { ICredentialsService as sqlICredentialsService, CredentialsService } from 'sql/platform/credentials/common/credentialsService'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { QueryModelService } from 'sql/platform/query/common/queryModelService'; @@ -147,8 +147,8 @@ 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 { IObjectExplorerService, ObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; -import { AngularEventingService } from 'sql/platform/angularEventing/node/angularEventingService'; +import { IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; +import { AngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingServiceImpl'; import { ISerializationService, SerializationService } from 'sql/platform/serialization/common/serializationService'; import { IMetadataService, MetadataService } from 'sql/platform/metadata/common/metadataService'; import { ITaskService, TaskService } from 'sql/platform/tasks/common/tasksService'; @@ -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/platform/accounts/browser/accountPickerService'; -import { IAccountPickerService } from 'sql/platform/accounts/browser/accountPicker'; +import { AccountPickerService } from 'sql/workbench/parts/accounts/browser/accountPickerService'; +import { IAccountPickerService } from 'sql/workbench/parts/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'; @@ -389,7 +389,7 @@ import 'sql/workbench/parts/queryPlan/browser/queryPlan.contribution'; //acounts import 'sql/workbench/parts/accounts/browser/accounts.contribution'; -import 'sql/platform/accounts/browser/accountManagement.contribution'; +import 'sql/workbench/parts/accounts/browser/accountManagement.contribution'; // profiler import 'sql/workbench/parts/profiler/browser/profiler.contribution'; diff --git a/tslint.json b/tslint.json index 5513162309..50787f9417 100644 --- a/tslint.json +++ b/tslint.json @@ -168,75 +168,95 @@ ] }, { - "target": "**/vs/platform/*/common/**", + "target": "**/{vs,sql}/platform/*/common/**", "restrictions": [ "vs/nls", "**/{vs,sql}/base/common/**", "**/{vs,sql}/base/parts/*/common/**", - "**/{vs,sql}/platform/*/common/**" + "**/{vs,sql}/{platform,workbench}/**/common/**", + "**/vs/editor/common/**", + "azdata" // TODO remove ] }, { - "target": "**/vs/platform/*/test/common/**", + "target": "**/{vs,sql}/platform/*/test/common/**", "restrictions": [ "assert", "sinon", "vs/nls", "**/{vs,sql}/base/common/**", - "**/{vs,sql}/platform/*/common/**", - "**/{vs,sql}/platform/*/test/common/**" + "**/{vs,sql}/{platform,workbench}/**/common/**", + "**/{vs,sql}/{base,platform,workbench}/**/test/common/**", + "typemoq", + "azdata" // TODO remove ] }, { - "target": "**/vs/platform/*/browser/**", + "target": "**/{vs,sql}/platform/*/browser/**", "restrictions": [ "vs/nls", "vs/css!./**/*", "**/{vs,sql}/base/{common,browser}/**", "**/{vs,sql}/base/parts/*/{common,browser}/**", - "**/{vs,sql}/platform/*/{common,browser}/**" + "**/{vs,sql}/{platform,workbench}/**/{common,browser}/**", + "**/vs/editor/{common,browser}/**", + "@angular/*", + "rxjs/*", + "azdata" // TODO remove ] }, { - "target": "**/vs/platform/*/node/**", + "target": "**/{vs,sql}/platform/*/node/**", "restrictions": [ "vs/nls", "**/{vs,sql}/base/{common,browser,node}/**", "**/{vs,sql}/base/parts/*/{common,browser,node}/**", - "**/{vs,sql}/platform/*/{common,browser,node}/**", - "!path" // node modules (except path where we have our own impl) + "**/{vs,sql}/{platform,workbench}/**/{common,browser,node}/**", + "**/vs/editor/{common,browser,node}/**", + "!path", // node modules (except path where we have our own impl) + "azdata" // TODO remove ] }, { - "target": "**/vs/platform/*/electron-browser/**", + "target": "**/{vs,sql}/platform/*/electron-browser/**", "restrictions": [ "vs/nls", "vs/css!./**/*", "**/{vs,sql}/base/{common,browser,node}/**", "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**", - "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**", - "!path" // node modules (except path where we have our own impl) + "**/{vs,sql}/{platform,workbench}/**/{common,browser,node,electron-browser}/**", + "**/vs/editor/{common,browser,node,electron-browser}/**", + "!path", // node modules (except path where we have our own impl) + "@angular/*", + "rxjs/*", + "azdata" // TODO remove ] }, { - "target": "**/vs/platform/*/electron-main/**", + "target": "**/{vs,sql}/platform/*/electron-main/**", "restrictions": [ "vs/nls", "**/{vs,sql}/base/{common,browser,node}/**", "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**", - "**/{vs,sql}/platform/*/{common,browser,node,electron-main}/**", - "!path" // node modules (except path where we have our own impl) + "**/{vs,sql}/{platform,workbench}/**/{common,browser,node,electron-main}/**", + "**/vs/editor/{common,browser,node,electron-main}/**", + "!path", // node modules (except path where we have our own impl) + "azdata" // TODO remove ] }, { - "target": "**/vs/platform/*/test/browser/**", + "target": "**/{vs,sql}/platform/*/test/browser/**", "restrictions": [ "assert", "sinon", "vs/nls", "**/{vs,sql}/base/{common,browser}/**", - "**/{vs,sql}/platform/*/{common,browser}/**", - "**/{vs,sql}/platform/*/test/{common,browser}/**" + "**/{vs,sql}/{platform,workbench}/**/{common,browser}/**", + "**/{vs,sql}/{base,platform,workbench}/**/test/{common,browser}/**", + "typemoq", + "@angular/*", + "rxjs/*", + "azdata" // TODO remove ] } ],