diff --git a/src/sql/platform/connection/common/connectionManagementService.ts b/src/sql/platform/connection/browser/connectionManagementService.ts similarity index 92% rename from src/sql/platform/connection/common/connectionManagementService.ts rename to src/sql/platform/connection/browser/connectionManagementService.ts index f078bccbbb..a2d3586259 100644 --- a/src/sql/platform/connection/common/connectionManagementService.ts +++ b/src/sql/platform/connection/browser/connectionManagementService.ts @@ -11,7 +11,6 @@ import { IConnectionParams, IConnectionResult, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; -import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; 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'; @@ -46,7 +45,7 @@ import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ILogService } from 'vs/platform/log/common/log'; -import * as interfaces from './interfaces'; +import * as interfaces from 'sql/platform/connection/common/interfaces'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { Memento } from 'vs/workbench/common/memento'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; @@ -59,7 +58,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti private _providers = new Map, properties: ConnectionProviderProperties }>(); private _iconProviders = new Map(); private _uriToProvider: { [uri: string]: string; } = Object.create(null); - private _onAddConnectionProfile = new Emitter(); + private _onAddConnectionProfile = new Emitter(); private _onDeleteConnectionProfile = new Emitter(); private _onConnect = new Emitter(); private _onDisconnect = new Emitter(); @@ -128,7 +127,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti } // Event Emitters - public get onAddConnectionProfile(): Event { + public get onAddConnectionProfile(): Event { return this._onAddConnectionProfile.event; } @@ -180,7 +179,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * @param params Include the uri, type of connection * @param model the existing connection profile to create a new one from */ - public showConnectionDialog(params?: INewConnectionParams, options?: IConnectionCompletionOptions, model?: IConnectionProfile, connectionResult?: IConnectionResult): Promise { + public showConnectionDialog(params?: INewConnectionParams, options?: IConnectionCompletionOptions, model?: interfaces.IConnectionProfile, connectionResult?: IConnectionResult): Promise { if (!params) { params = { connectionType: ConnectionType.default }; } @@ -197,7 +196,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * Load the password for the profile * @param connectionProfile Connection Profile */ - public async addSavedPassword(connectionProfile: IConnectionProfile): Promise { + public async addSavedPassword(connectionProfile: interfaces.IConnectionProfile): Promise { await this.fillInOrClearAzureToken(connectionProfile); return this._connectionStore.addSavedPassword(connectionProfile).then(result => result.profile); } @@ -220,7 +219,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * @param owner of the connection. Can be the editors * @param options to use after the connection is complete */ - private tryConnect(connection: IConnectionProfile, owner: IConnectableInput, options?: IConnectionCompletionOptions): Promise { + private tryConnect(connection: interfaces.IConnectionProfile, owner: IConnectableInput, options?: IConnectionCompletionOptions): Promise { // Load the password if it's not already loaded return this._connectionStore.addSavedPassword(connection).then(async result => { let newConnection = result.profile; @@ -261,7 +260,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * otherwise does nothing */ private showConnectionDialogOnError( - connection: IConnectionProfile, + connection: interfaces.IConnectionProfile, owner: IConnectableInput, connectionResult: IConnectionResult, options?: IConnectionCompletionOptions): Promise { @@ -287,7 +286,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * @param options to be used after the connection is completed * @param callbacks to call after the connection is completed */ - public connect(connection: IConnectionProfile, uri: string, options?: IConnectionCompletionOptions, callbacks?: IConnectionCallbacks): Promise { + public connect(connection: interfaces.IConnectionProfile, uri: string, options?: IConnectionCompletionOptions, callbacks?: IConnectionCallbacks): Promise { if (!uri) { uri = Utils.generateUri(connection); } @@ -316,7 +315,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * otherwise tries to make a connection and returns the owner uri when connection is complete * The purpose is connection by default */ - public connectIfNotConnected(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection' | 'notebook', saveConnection: boolean = false): Promise { + public connectIfNotConnected(connection: interfaces.IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection' | 'notebook', saveConnection: boolean = false): Promise { let ownerUri: string = Utils.generateUri(connection, purpose); if (this._connectionStatusManager.isConnected(ownerUri)) { return Promise.resolve(this._connectionStatusManager.getOriginalOwnerUri(ownerUri)); @@ -343,7 +342,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * This method doesn't load the password because it only gets called from the * connection dialog and password should be already in the profile */ - public connectAndSaveProfile(connection: IConnectionProfile, uri: string, options?: IConnectionCompletionOptions, callbacks?: IConnectionCallbacks): + public connectAndSaveProfile(connection: interfaces.IConnectionProfile, uri: string, options?: IConnectionCompletionOptions, callbacks?: IConnectionCallbacks): Promise { if (!options) { options = { @@ -360,7 +359,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return this.connectWithOptions(connection, uri, options, callbacks); } - private async connectWithOptions(connection: IConnectionProfile, uri: string, options?: IConnectionCompletionOptions, callbacks?: IConnectionCallbacks): Promise { + private async connectWithOptions(connection: interfaces.IConnectionProfile, uri: string, options?: IConnectionCompletionOptions, callbacks?: IConnectionCallbacks): Promise { connection.options['groupId'] = connection.groupId; connection.options['databaseDisplayName'] = connection.databaseName; @@ -440,7 +439,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - private handleConnectionError(connection: IConnectionProfile, uri: string, options: IConnectionCompletionOptions, callbacks: IConnectionCallbacks, connectionResult: IConnectionResult) { + private handleConnectionError(connection: interfaces.IConnectionProfile, uri: string, options: IConnectionCompletionOptions, callbacks: IConnectionCallbacks, connectionResult: IConnectionResult) { let connectionNotAcceptedError = nls.localize('connectionNotAcceptedError', "Connection Not Accepted"); if (options.showFirewallRuleOnError && connectionResult.errorCode) { return this.handleFirewallRuleError(connection, connectionResult).then(success => { @@ -462,7 +461,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti } } - private handleFirewallRuleError(connection: IConnectionProfile, connectionResult: IConnectionResult): Promise { + private handleFirewallRuleError(connection: interfaces.IConnectionProfile, connectionResult: IConnectionResult): Promise { return this._resourceProviderService.handleFirewallRule(connectionResult.errorCode, connectionResult.errorMessage, connection.providerName).then(response => { if (response.canHandleFirewallRule) { connectionResult.errorHandled = true; @@ -510,11 +509,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti return this._mementoObj.CONNECTION_ICON_ID[connectionId]; } - public showDashboard(connection: IConnectionProfile): Thenable { + public showDashboard(connection: interfaces.IConnectionProfile): Thenable { return this.showDashboardForConnectionManagementInfo(connection); } - private showDashboardForConnectionManagementInfo(connectionProfile: IConnectionProfile): Thenable { + private showDashboardForConnectionManagementInfo(connectionProfile: interfaces.IConnectionProfile): Thenable { // if dashboard profile is already open, focus on that tab if (!this.focusDashboard(connectionProfile)) { let dashboardInput: DashboardInput = this._instantiationService ? this._instantiationService.createInstance(DashboardInput, connectionProfile) : undefined; @@ -526,7 +525,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti } } - private focusDashboard(profile: IConnectionProfile): boolean { + private focusDashboard(profile: interfaces.IConnectionProfile): boolean { let found: boolean = false; this._editorService.editors.map(editor => { @@ -567,7 +566,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return this._connectionStore.clearRecentlyUsed(); } - public clearRecentConnection(connectionProfile: IConnectionProfile): void { + public clearRecentConnection(connectionProfile: interfaces.IConnectionProfile): void { this._connectionStore.removeRecentConnection(connectionProfile); } @@ -639,7 +638,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return false; } - public getConnectionUri(connectionProfile: IConnectionProfile): string { + public getConnectionUri(connectionProfile: interfaces.IConnectionProfile): string { return this._connectionStatusManager.getOriginalOwnerUri(Utils.generateUri(connectionProfile)); } @@ -647,7 +646,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * Returns a formatted URI in case the database field is empty for the original * URI, which happens when the connected database is master or the default database */ - public getFormattedUri(uri: string, connectionProfile: IConnectionProfile): string { + public getFormattedUri(uri: string, connectionProfile: interfaces.IConnectionProfile): string { if (this._connectionStatusManager.isDefaultTypeUri(uri)) { return this.getConnectionUri(connectionProfile); } else { @@ -701,7 +700,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * and clears it if it isn't. * @param connection The connection to fill in or update */ - private async fillInOrClearAzureToken(connection: IConnectionProfile): Promise { + private async fillInOrClearAzureToken(connection: interfaces.IConnectionProfile): Promise { if (connection.authenticationType !== Constants.azureMFA) { connection.options['azureAccountToken'] = undefined; return true; @@ -742,7 +741,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti } // Request Senders - private async sendConnectRequest(connection: IConnectionProfile, uri: string): Promise { + private async sendConnectRequest(connection: interfaces.IConnectionProfile, uri: string): Promise { let connectionInfo = Object.assign({}, { options: connection.options }); @@ -800,7 +799,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - private saveToSettings(id: string, connection: IConnectionProfile): Promise { + private saveToSettings(id: string, connection: interfaces.IConnectionProfile): Promise { return this._connectionStore.saveProfile(connection).then(savedProfile => { let newId = this._connectionStatusManager.updateConnectionProfile(savedProfile, id); return newId; @@ -810,7 +809,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti /** * Add a connection to the active connections list. */ - private tryAddActiveConnection(connectionManagementInfo: ConnectionManagementInfo, newConnection: IConnectionProfile, addToMru: boolean): void { + private tryAddActiveConnection(connectionManagementInfo: ConnectionManagementInfo, newConnection: interfaces.IConnectionProfile, addToMru: boolean): void { if (newConnection && addToMru) { this._connectionStore.addRecentConnection(newConnection) .then(() => { @@ -835,7 +834,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - private addTelemetryForConnectionDisconnected(connection: IConnectionProfile): void { + private addTelemetryForConnectionDisconnected(connection: interfaces.IConnectionProfile): void { TelemetryUtils.addTelemetry(this._telemetryService, this._logService, TelemetryKeys.DatabaseDisconnected, { provider: connection.providerName }); @@ -863,11 +862,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti } public onConnectionChangedNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void { - let profile: IConnectionProfile = this._connectionStatusManager.onConnectionChanged(changedConnInfo); + let profile: interfaces.IConnectionProfile = this._connectionStatusManager.onConnectionChanged(changedConnInfo); this._notifyConnectionChanged(profile, changedConnInfo.connectionUri); } - private _notifyConnectionChanged(profile: IConnectionProfile, connectionUri: string): void { + private _notifyConnectionChanged(profile: interfaces.IConnectionProfile, connectionUri: string): void { if (profile) { this._onConnectionChanged.fire({ connectionProfile: profile, @@ -946,7 +945,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti */ // Connect an open URI to a connection profile - private createNewConnection(uri: string, connection: IConnectionProfile): Promise { + private createNewConnection(uri: string, connection: interfaces.IConnectionProfile): Promise { const self = this; this._logService.info(`Creating new connection ${uri}`); return new Promise((resolve, reject) => { @@ -988,7 +987,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - private doDisconnect(fileUri: string, connection?: IConnectionProfile): Promise { + private doDisconnect(fileUri: string, connection?: interfaces.IConnectionProfile): Promise { let disconnectParams = new ConnectionContracts.DisconnectParams(); disconnectParams.ownerUri = fileUri; @@ -1013,11 +1012,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - public disconnect(connection: IConnectionProfile): Promise; + public disconnect(connection: interfaces.IConnectionProfile): Promise; public disconnect(ownerUri: string): Promise; - public disconnect(input: string | IConnectionProfile): Promise { + public disconnect(input: string | interfaces.IConnectionProfile): Promise { let uri: string; - let profile: IConnectionProfile; + let profile: interfaces.IConnectionProfile; if (typeof input === 'object') { uri = Utils.generateUri(input); profile = input; @@ -1035,7 +1034,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti }); } - public cancelConnection(connection: IConnectionProfile): Thenable { + public cancelConnection(connection: interfaces.IConnectionProfile): Thenable { let fileUri = Utils.generateUri(connection); return this.cancelConnectionForUri(fileUri); } @@ -1071,7 +1070,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti * Finds existing connection for given profile and purpose is any exists. * The purpose is connection by default */ - public findExistingConnection(connection: IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection' | 'notebook'): ConnectionProfile { + public findExistingConnection(connection: interfaces.IConnectionProfile, purpose?: 'dashboard' | 'insights' | 'connection' | 'notebook'): ConnectionProfile { let connectionUri = Utils.generateUri(connection, purpose); let existingConnection = this._connectionStatusManager.findConnection(connectionUri); if (existingConnection && this._connectionStatusManager.isConnected(connectionUri)) { @@ -1081,12 +1080,12 @@ export class ConnectionManagementService extends Disposable implements IConnecti } } - public isProfileConnected(connectionProfile: IConnectionProfile): boolean { + public isProfileConnected(connectionProfile: interfaces.IConnectionProfile): boolean { let connectionManagement = this._connectionStatusManager.findConnectionProfile(connectionProfile); return connectionManagement && !connectionManagement.connecting; } - public isProfileConnecting(connectionProfile: IConnectionProfile): boolean { + public isProfileConnecting(connectionProfile: interfaces.IConnectionProfile): boolean { let connectionManagement = this._connectionStatusManager.findConnectionProfile(connectionProfile); return connectionManagement && connectionManagement.connecting; } @@ -1095,7 +1094,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return this._connectionStatusManager.isConnecting(fileUri); } - public getConnectionProfile(fileUri: string): IConnectionProfile { + public getConnectionProfile(fileUri: string): interfaces.IConnectionProfile { return this._connectionStatusManager.isConnected(fileUri) ? this._connectionStatusManager.getConnectionProfile(fileUri) : undefined; } @@ -1210,7 +1209,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return Promise.resolve(undefined); } - private _notifyDisconnected(connectionProfile: IConnectionProfile, connectionUri: string): void { + private _notifyDisconnected(connectionProfile: interfaces.IConnectionProfile, connectionUri: string): void { this._onDisconnect.fire({ connectionUri: connectionUri, connectionProfile: connectionProfile @@ -1247,7 +1246,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return matchingGroup.color; } - public removeConnectionProfileCredentials(originalProfile: IConnectionProfile): IConnectionProfile { + public removeConnectionProfileCredentials(originalProfile: interfaces.IConnectionProfile): interfaces.IConnectionProfile { return this._connectionStore.getProfileWithoutPassword(originalProfile); } @@ -1280,7 +1279,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti return serverInfo; } - public getConnectionProfileById(profileId: string): IConnectionProfile { + public getConnectionProfileById(profileId: string): interfaces.IConnectionProfile { let profile = this._connectionStatusManager.findConnectionByProfileId(profileId); if (!profile) { return undefined; diff --git a/src/sql/platform/connection/test/common/connectionManagementService.test.ts b/src/sql/platform/connection/test/browser/connectionManagementService.test.ts similarity index 99% rename from src/sql/platform/connection/test/common/connectionManagementService.test.ts rename to src/sql/platform/connection/test/browser/connectionManagementService.test.ts index 772b4899a7..ddf4669644 100644 --- a/src/sql/platform/connection/test/common/connectionManagementService.test.ts +++ b/src/sql/platform/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/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/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/platform/dashboard/common/dashboardViewService.ts b/src/sql/platform/dashboard/browser/dashboardViewService.ts similarity index 92% rename from src/sql/platform/dashboard/common/dashboardViewService.ts rename to src/sql/platform/dashboard/browser/dashboardViewService.ts index 4bc4ab4a72..e883349836 100644 --- a/src/sql/platform/dashboard/common/dashboardViewService.ts +++ b/src/sql/platform/dashboard/browser/dashboardViewService.ts @@ -6,7 +6,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; -import { IView, IModelView } from 'sql/platform/model/common/modelViewService'; +import { IView, IModelView } from 'sql/platform/model/browser/modelViewService'; export const SERVICE_ID = 'dashboardViewService'; diff --git a/src/sql/platform/dashboard/common/dashboardViewServiceImpl.ts b/src/sql/platform/dashboard/browser/dashboardViewServiceImpl.ts similarity index 89% rename from src/sql/platform/dashboard/common/dashboardViewServiceImpl.ts rename to src/sql/platform/dashboard/browser/dashboardViewServiceImpl.ts index 39a2594c5e..ac84ee040a 100644 --- a/src/sql/platform/dashboard/common/dashboardViewServiceImpl.ts +++ b/src/sql/platform/dashboard/browser/dashboardViewServiceImpl.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/common/dashboardViewService'; +import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/browser/dashboardViewService'; import { Event, Emitter } from 'vs/base/common/event'; -import { IModelView } from 'sql/platform/model/common/modelViewService'; +import { IModelView } from 'sql/platform/model/browser/modelViewService'; export class DashboardViewService implements IDashboardViewService { _serviceBrand: any; diff --git a/src/sql/platform/model/common/modelViewService.ts b/src/sql/platform/model/browser/modelViewService.ts similarity index 100% rename from src/sql/platform/model/common/modelViewService.ts rename to src/sql/platform/model/browser/modelViewService.ts diff --git a/src/sql/platform/modelComponents/common/modelViewService.ts b/src/sql/platform/modelComponents/browser/modelViewService.ts similarity index 89% rename from src/sql/platform/modelComponents/common/modelViewService.ts rename to src/sql/platform/modelComponents/browser/modelViewService.ts index 798679dd87..1772f36662 100644 --- a/src/sql/platform/modelComponents/common/modelViewService.ts +++ b/src/sql/platform/modelComponents/browser/modelViewService.ts @@ -6,7 +6,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; -import { IModelView } from 'sql/platform/model/common/modelViewService'; +import { IModelView } from 'sql/platform/model/browser/modelViewService'; export const SERVICE_ID = 'modelViewService'; @@ -16,4 +16,4 @@ export interface IModelViewService { registerModelView(widget: IModelView); } -export const IModelViewService = createDecorator(SERVICE_ID); \ No newline at end of file +export const IModelViewService = createDecorator(SERVICE_ID); diff --git a/src/sql/platform/modelComponents/common/modelViewServiceImpl.ts b/src/sql/platform/modelComponents/browser/modelViewServiceImpl.ts similarity index 88% rename from src/sql/platform/modelComponents/common/modelViewServiceImpl.ts rename to src/sql/platform/modelComponents/browser/modelViewServiceImpl.ts index d701ace085..7d00b1c819 100644 --- a/src/sql/platform/modelComponents/common/modelViewServiceImpl.ts +++ b/src/sql/platform/modelComponents/browser/modelViewServiceImpl.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; +import { IModelViewService } from 'sql/platform/modelComponents/browser/modelViewService'; import { Event, Emitter } from 'vs/base/common/event'; -import { IModelView } from 'sql/platform/model/common/modelViewService'; +import { IModelView } from 'sql/platform/model/browser/modelViewService'; export class ModelViewService implements IModelViewService { _serviceBrand: any; diff --git a/src/sql/platform/restore/common/restoreServiceImpl.ts b/src/sql/platform/restore/browser/restoreServiceImpl.ts similarity index 99% rename from src/sql/platform/restore/common/restoreServiceImpl.ts rename to src/sql/platform/restore/browser/restoreServiceImpl.ts index 3cc3d94b89..464dcccdb2 100644 --- a/src/sql/platform/restore/common/restoreServiceImpl.ts +++ b/src/sql/platform/restore/browser/restoreServiceImpl.ts @@ -18,7 +18,7 @@ import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import * as Utils from 'sql/platform/connection/common/utils'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { ITaskService } from 'sql/platform/tasks/common/tasksService'; import { TaskStatus, TaskNode } from 'sql/platform/tasks/common/tasksNode'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; diff --git a/src/sql/workbench/api/browser/mainThreadConnectionManagement.ts b/src/sql/workbench/api/browser/mainThreadConnectionManagement.ts index ae60e5365d..dbfa4d2e7e 100644 --- a/src/sql/workbench/api/browser/mainThreadConnectionManagement.ts +++ b/src/sql/workbench/api/browser/mainThreadConnectionManagement.ts @@ -8,7 +8,7 @@ import * as azdata from 'azdata'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { IConnectionManagementService, ConnectionType, IConnectionParams } from 'sql/platform/connection/common/connectionManagement'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/api/browser/mainThreadDashboardWebview.ts b/src/sql/workbench/api/browser/mainThreadDashboardWebview.ts index 2c7b9b76e2..756e946067 100644 --- a/src/sql/workbench/api/browser/mainThreadDashboardWebview.ts +++ b/src/sql/workbench/api/browser/mainThreadDashboardWebview.ts @@ -6,7 +6,7 @@ import { MainThreadDashboardWebviewShape, SqlMainContext, ExtHostDashboardWebviewsShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; -import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/common/dashboardViewService'; +import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/browser/dashboardViewService'; @extHostNamedCustomer(SqlMainContext.MainThreadDashboardWebview) export class MainThreadDashboardWebview implements MainThreadDashboardWebviewShape { diff --git a/src/sql/workbench/api/browser/mainThreadDataProtocol.ts b/src/sql/workbench/api/browser/mainThreadDataProtocol.ts index 5fdb816d04..97eb6628f3 100644 --- a/src/sql/workbench/api/browser/mainThreadDataProtocol.ts +++ b/src/sql/workbench/api/browser/mainThreadDataProtocol.ts @@ -13,14 +13,14 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import * as azdata from 'azdata'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; -import { IObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { IBackupService } from 'sql/platform/backup/common/backupService'; import { IRestoreService } from 'sql/platform/restore/common/restoreService'; import { ITaskService } from 'sql/platform/tasks/common/tasksService'; -import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { ISerializationService } from 'sql/platform/serialization/common/serializationService'; import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; diff --git a/src/sql/workbench/api/browser/mainThreadModelView.ts b/src/sql/workbench/api/browser/mainThreadModelView.ts index b386aac69d..df6d69be43 100644 --- a/src/sql/workbench/api/browser/mainThreadModelView.ts +++ b/src/sql/workbench/api/browser/mainThreadModelView.ts @@ -9,9 +9,9 @@ import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; +import { IModelViewService } from 'sql/platform/modelComponents/browser/modelViewService'; import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IModelView } from 'sql/platform/model/common/modelViewService'; +import { IModelView } from 'sql/platform/model/browser/modelViewService'; @extHostNamedCustomer(SqlMainContext.MainThreadModelView) diff --git a/src/sql/workbench/api/browser/mainThreadNotebook.ts b/src/sql/workbench/api/browser/mainThreadNotebook.ts index 4a504e72b6..71a54cdd84 100644 --- a/src/sql/workbench/api/browser/mainThreadNotebook.ts +++ b/src/sql/workbench/api/browser/mainThreadNotebook.ts @@ -11,11 +11,11 @@ import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { Event, Emitter } from 'vs/base/common/event'; import { URI } from 'vs/base/common/uri'; -import { INotebookService, INotebookProvider, INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService, INotebookProvider, INotebookManager } from 'sql/workbench/services/notebook/browser/notebookService'; import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, FutureMessageType, INotebookFutureDetails, INotebookFutureDone } from 'sql/workbench/api/common/sqlExtHostTypes'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; import { Deferred } from 'sql/base/common/promise'; -import { FutureInternal } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { FutureInternal } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @extHostNamedCustomer(SqlMainContext.MainThreadNotebook) diff --git a/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts index 926950cf9f..d2c2efa94d 100644 --- a/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts @@ -23,16 +23,16 @@ import { INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; -import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/browser/notebookService'; import { ISingleNotebookEditOperation, NotebookChangeKind } from 'sql/workbench/api/common/sqlExtHostTypes'; import { disposed } from 'vs/base/common/errors'; -import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel, NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { NotebookChangeType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor'; -import { notebookModeId } from 'sql/workbench/common/customInputConverter'; +import { notebookModeId } from 'sql/workbench/browser/customInputConverter'; import { localize } from 'vs/nls'; class MainThreadNotebookEditor extends Disposable { diff --git a/src/sql/workbench/api/browser/mainThreadObjectExplorer.ts b/src/sql/workbench/api/browser/mainThreadObjectExplorer.ts index 6f255f72ff..3e53d9206c 100644 --- a/src/sql/workbench/api/browser/mainThreadObjectExplorer.ts +++ b/src/sql/workbench/api/browser/mainThreadObjectExplorer.ts @@ -8,7 +8,7 @@ import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; -import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { Disposable } from 'vs/base/common/lifecycle'; @extHostNamedCustomer(SqlMainContext.MainThreadObjectExplorer) diff --git a/src/sql/workbench/common/actions.contribution.ts b/src/sql/workbench/browser/actions.contribution.ts similarity index 100% rename from src/sql/workbench/common/actions.contribution.ts rename to src/sql/workbench/browser/actions.contribution.ts diff --git a/src/sql/workbench/common/actions.ts b/src/sql/workbench/browser/actions.ts similarity index 100% rename from src/sql/workbench/common/actions.ts rename to src/sql/workbench/browser/actions.ts diff --git a/src/sql/workbench/common/customInputConverter.ts b/src/sql/workbench/browser/customInputConverter.ts similarity index 99% rename from src/sql/workbench/common/customInputConverter.ts rename to src/sql/workbench/browser/customInputConverter.ts index e9248892aa..6c512f47d0 100644 --- a/src/sql/workbench/common/customInputConverter.ts +++ b/src/sql/workbench/browser/customInputConverter.ts @@ -13,7 +13,7 @@ import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput'; diff --git a/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts b/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts index aa2001369c..685a5f8ea5 100644 --- a/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts +++ b/src/sql/workbench/browser/modelComponents/modelViewContent.component.ts @@ -11,9 +11,9 @@ 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 { IModelView } from 'sql/platform/model/common/modelViewService'; +import { IModelView } from 'sql/platform/model/browser/modelViewService'; import { ViewBase } from 'sql/workbench/browser/modelComponents/viewBase'; -import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; +import { IModelViewService } from 'sql/platform/modelComponents/browser/modelViewService'; import * as azdata from 'azdata'; diff --git a/src/sql/workbench/browser/modelComponents/viewBase.ts b/src/sql/workbench/browser/modelComponents/viewBase.ts index 93271d78c9..fa3329c6f9 100644 --- a/src/sql/workbench/browser/modelComponents/viewBase.ts +++ b/src/sql/workbench/browser/modelComponents/viewBase.ts @@ -11,7 +11,7 @@ import * as nls from 'vs/nls'; import * as azdata from 'azdata'; import { IModelStore, IComponentDescriptor, IComponent } from './interfaces'; import { IItemConfig, ModelComponentTypes, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IModelView, IModelViewEventArgs } from 'sql/platform/model/common/modelViewService'; +import { IModelView, IModelViewEventArgs } from 'sql/platform/model/browser/modelViewService'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { ModelStore } from 'sql/workbench/browser/modelComponents/modelStore'; diff --git a/src/sql/workbench/browser/parts/views/customView.ts b/src/sql/workbench/browser/parts/views/customView.ts index 973a2a732d..c4f9fdacf1 100644 --- a/src/sql/workbench/browser/parts/views/customView.ts +++ b/src/sql/workbench/browser/parts/views/customView.ts @@ -46,8 +46,8 @@ import { FuzzyScore, createMatches } from 'vs/base/common/filters'; import { CollapseAllAction } from 'vs/base/browser/ui/tree/treeDefaults'; import { ITreeItem, ITreeView } from 'sql/workbench/common/views'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; -import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/common/nodeContext'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; +import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; export class CustomTreeViewPanel extends ViewletPanel { diff --git a/src/sql/workbench/browser/taskUtilities.ts b/src/sql/workbench/browser/taskUtilities.ts index a3d072b54e..6dd286b18c 100644 --- a/src/sql/workbench/browser/taskUtilities.ts +++ b/src/sql/workbench/browser/taskUtilities.ts @@ -11,7 +11,7 @@ import { } from 'sql/platform/connection/common/connectionManagement'; import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput'; import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput'; import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; diff --git a/src/sql/workbench/common/sqlWorkbenchUtils.ts b/src/sql/workbench/common/sqlWorkbenchUtils.ts index 850a17266e..34458b222e 100644 --- a/src/sql/workbench/common/sqlWorkbenchUtils.ts +++ b/src/sql/workbench/common/sqlWorkbenchUtils.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import ConnectionConstants = require('sql/platform/connection/common/constants'); +import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/workbench/contrib/extensions/common/extensionsActions.ts b/src/sql/workbench/contrib/extensions/browser/extensionsActions.ts similarity index 100% rename from src/sql/workbench/contrib/extensions/common/extensionsActions.ts rename to src/sql/workbench/contrib/extensions/browser/extensionsActions.ts diff --git a/src/sql/workbench/electron-browser/scriptingActions.ts b/src/sql/workbench/electron-browser/scriptingActions.ts index 70687b35c3..5ea57fe749 100644 --- a/src/sql/workbench/electron-browser/scriptingActions.ts +++ b/src/sql/workbench/electron-browser/scriptingActions.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IScriptingService, ScriptOperation } from 'sql/platform/scripting/common/scriptingService'; -import { BaseActionContext } from 'sql/workbench/common/actions'; +import { BaseActionContext } from 'sql/workbench/browser/actions'; import { scriptSelect, script, scriptEditSelect } from 'sql/workbench/electron-browser/scriptingUtils'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/workbench/parts/backup/browser/backup.contribution.ts b/src/sql/workbench/parts/backup/browser/backup.contribution.ts index 1642755dd1..45ae425625 100644 --- a/src/sql/workbench/parts/backup/browser/backup.contribution.ts +++ b/src/sql/workbench/parts/backup/browser/backup.contribution.ts @@ -8,10 +8,10 @@ import { ConnectedContext } from 'azdata'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { BackupAction } from 'sql/workbench/parts/backup/browser/backupActions'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { ManageActionContext } from 'sql/workbench/common/actions'; +import { ManageActionContext } from 'sql/workbench/browser/actions'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { localize } from 'vs/nls'; diff --git a/src/sql/workbench/parts/backup/browser/backupActions.ts b/src/sql/workbench/parts/backup/browser/backupActions.ts index b3e294a053..6322a6a606 100644 --- a/src/sql/workbench/parts/backup/browser/backupActions.ts +++ b/src/sql/workbench/parts/backup/browser/backupActions.ts @@ -9,7 +9,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { getCurrentGlobalConnection } from 'sql/workbench/browser/taskUtilities'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/parts/connection/browser/connection.contribution.ts b/src/sql/workbench/parts/connection/browser/connection.contribution.ts index 341acdb59c..dd9493e8c5 100644 --- a/src/sql/workbench/parts/connection/browser/connection.contribution.ts +++ b/src/sql/workbench/parts/connection/browser/connection.contribution.ts @@ -6,7 +6,7 @@ import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; import { AddServerGroupAction, AddServerAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; -import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/parts/connection/common/connectionActions'; +import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/parts/connection/browser/connectionActions'; import * as azdata from 'azdata'; import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; diff --git a/src/sql/workbench/parts/connection/common/connectionActions.ts b/src/sql/workbench/parts/connection/browser/connectionActions.ts similarity index 99% rename from src/sql/workbench/parts/connection/common/connectionActions.ts rename to src/sql/workbench/parts/connection/browser/connectionActions.ts index 3fd4413d7e..17417bdca0 100644 --- a/src/sql/workbench/parts/connection/common/connectionActions.ts +++ b/src/sql/workbench/parts/connection/browser/connectionActions.ts @@ -17,7 +17,7 @@ import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInpu import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; /** * Workbench action to clear the recent connnections list diff --git a/src/sql/workbench/parts/connection/browser/connectionStatus.ts b/src/sql/workbench/parts/connection/browser/connectionStatus.ts index 1edd8c9ba8..4f92a6931d 100644 --- a/src/sql/workbench/parts/connection/browser/connectionStatus.ts +++ b/src/sql/workbench/parts/connection/browser/connectionStatus.ts @@ -7,7 +7,7 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; import { IStatusbarEntryAccessor, IStatusbarService, StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; diff --git a/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts b/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts index 2af764554e..bfce15a121 100644 --- a/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts +++ b/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts @@ -7,7 +7,7 @@ import { DefaultController, ICancelableEvent } from 'vs/base/parts/tree/browser/ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { ClearSingleRecentConnectionAction } from 'sql/workbench/parts/connection/common/connectionActions'; +import { ClearSingleRecentConnectionAction } from 'sql/workbench/parts/connection/browser/connectionActions'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts b/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts index 063adbe21b..15935e239e 100644 --- a/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts +++ b/src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts @@ -13,7 +13,7 @@ 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 { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; +import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewService'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import * as azdata from 'azdata'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts b/src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts index 04c4fadd66..278a7f7e24 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts +++ b/src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts @@ -15,7 +15,7 @@ import { DASHBOARD_CONFIG_ID } from 'sql/workbench/parts/dashboard/browser/pages import { DATABASE_DASHBOARD_PROPERTIES, databaseDashboardPropertiesSchema, DATABASE_DASHBOARD_SETTING, databaseDashboardSettingSchema, DATABASE_DASHBOARD_TABS, databaseDashboardTabsSchema } from 'sql/workbench/parts/dashboard/browser/pages/databaseDashboardPage.contribution'; import { SERVER_DASHBOARD_PROPERTIES, serverDashboardPropertiesSchema, SERVER_DASHBOARD_SETTING, serverDashboardSettingSchema, SERVER_DASHBOARD_TABS, serverDashboardTabsSchema } from 'sql/workbench/parts/dashboard/browser/pages/serverDashboardPage.contribution'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; import { DE_MANAGE_COMMAND_ID, OE_MANAGE_COMMAND_ID } from 'sql/workbench/parts/dashboard/browser/dashboardActions'; diff --git a/src/sql/workbench/parts/dashboard/browser/dashboardActions.ts b/src/sql/workbench/parts/dashboard/browser/dashboardActions.ts index 51c801bbe1..afdc5e0bc5 100644 --- a/src/sql/workbench/parts/dashboard/browser/dashboardActions.ts +++ b/src/sql/workbench/parts/dashboard/browser/dashboardActions.ts @@ -17,7 +17,7 @@ import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IViewsService } from 'vs/workbench/common/views'; import { ConnectionViewletPanel } from 'sql/workbench/parts/dataExplorer/browser/connectionViewletPanel'; 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 fcfda06f74..ad6cb4b266 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTree.ts @@ -8,7 +8,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 { ManageActionContext, BaseActionContext } from 'sql/workbench/common/actions'; +import { ManageActionContext, BaseActionContext } from 'sql/workbench/browser/actions'; import * as tree from 'vs/base/parts/tree/browser/tree'; import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults'; 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 64963351b7..8070b07d4d 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeActions.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ManageAction, ManageActionContext } from 'sql/workbench/common/actions'; +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 { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/insights/actions.ts b/src/sql/workbench/parts/dashboard/browser/widgets/insights/actions.ts index 6246205c36..1dade9c533 100644 --- a/src/sql/workbench/parts/dashboard/browser/widgets/insights/actions.ts +++ b/src/sql/workbench/parts/dashboard/browser/widgets/insights/actions.ts @@ -7,7 +7,7 @@ import { Action } from 'vs/base/common/actions'; import * as nls from 'vs/nls'; import { RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; -import { InsightActionContext } from 'sql/workbench/common/actions'; +import { InsightActionContext } from 'sql/workbench/browser/actions'; import { openNewQuery } from 'sql/workbench/parts/query/browser/queryActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; 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 c1c1d148c9..ce2bccbaff 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 @@ -12,7 +12,7 @@ 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 { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive'; -import { InsightAction, InsightActionContext } from 'sql/workbench/common/actions'; +import { InsightAction, InsightActionContext } from 'sql/workbench/browser/actions'; import { Extensions, IInsightRegistry, IInsightsConfig, IInsightsView, getWidgetAutoRefreshState } from 'sql/platform/dashboard/browser/insightRegistry'; import { resolveQueryFilePath } from 'sql/workbench/services/insights/common/insightsUtils'; diff --git a/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts b/src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts index f346bfb098..572db5cdbf 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 @@ -12,7 +12,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 { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; +import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewService'; import * as azdata from 'azdata'; import { WebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview'; diff --git a/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts b/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts index 19b627806e..8ae0b9bb25 100644 --- a/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts +++ b/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts @@ -8,7 +8,7 @@ import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/q import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IEditorProgressService, IProgressService, ProgressLocation } from 'vs/platform/progress/common/progress'; -import { BaseActionContext } from 'sql/workbench/common/actions'; +import { BaseActionContext } from 'sql/workbench/browser/actions'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class ExplorerScriptSelectAction extends ScriptSelectAction { diff --git a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts b/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts index d668aceaf9..0ce1ac3fbf 100644 --- a/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts @@ -18,7 +18,7 @@ import { ActiveConnectionsFilterAction, AddServerAction, AddServerGroupAction } from 'sql/workbench/parts/objectExplorer/browser/connectionTreeAction'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ITree } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/workbench/parts/dataExplorer/common/extensionActions.ts b/src/sql/workbench/parts/dataExplorer/browser/extensionActions.ts similarity index 99% rename from src/sql/workbench/parts/dataExplorer/common/extensionActions.ts rename to src/sql/workbench/parts/dataExplorer/browser/extensionActions.ts index 6f7836f413..d550e5896a 100644 --- a/src/sql/workbench/parts/dataExplorer/common/extensionActions.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/extensionActions.ts @@ -6,7 +6,7 @@ import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import * as azdata from 'azdata'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/parts/dataExplorer/common/extensions.contribution.ts b/src/sql/workbench/parts/dataExplorer/browser/extensions.contribution.ts similarity index 98% rename from src/sql/workbench/parts/dataExplorer/common/extensions.contribution.ts rename to src/sql/workbench/parts/dataExplorer/browser/extensions.contribution.ts index b39e4b86e3..c26d68dc2e 100644 --- a/src/sql/workbench/parts/dataExplorer/common/extensions.contribution.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/extensions.contribution.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; -import { DATA_TIER_WIZARD_COMMAND_ID, PROFILER_COMMAND_ID, IMPORT_COMMAND_ID, SCHEMA_COMPARE_COMMAND_ID, GENERATE_SCRIPTS_COMMAND_ID, PROPERTIES_COMMAND_ID } from 'sql/workbench/parts/dataExplorer/common/extensionActions'; +import { DATA_TIER_WIZARD_COMMAND_ID, PROFILER_COMMAND_ID, IMPORT_COMMAND_ID, SCHEMA_COMPARE_COMMAND_ID, GENERATE_SCRIPTS_COMMAND_ID, PROPERTIES_COMMAND_ID } from 'sql/workbench/parts/dataExplorer/browser/extensionActions'; import { ContextKeyExpr, ContextKeyRegexExpr } from 'vs/platform/contextkey/common/contextkey'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { localize } from 'vs/nls'; diff --git a/src/sql/workbench/parts/dataExplorer/common/mssqlNodeContext.ts b/src/sql/workbench/parts/dataExplorer/browser/mssqlNodeContext.ts similarity index 99% rename from src/sql/workbench/parts/dataExplorer/common/mssqlNodeContext.ts rename to src/sql/workbench/parts/dataExplorer/browser/mssqlNodeContext.ts index 113ea9ccfc..a69f8fb7cc 100644 --- a/src/sql/workbench/parts/dataExplorer/common/mssqlNodeContext.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/mssqlNodeContext.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/common/nodeContext'; +import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { Disposable } from 'vs/base/common/lifecycle'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution.ts b/src/sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution.ts similarity index 97% rename from src/sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution.ts rename to src/sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution.ts index a5a2a63541..25c38843d7 100644 --- a/src/sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution.ts @@ -10,8 +10,8 @@ import { DISCONNECT_COMMAND_ID, REFRESH_COMMAND_ID } from './nodeCommands.common'; import { ContextKeyExpr, ContextKeyNotEqualsExpr } from 'vs/platform/contextkey/common/contextkey'; -import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/common/nodeContext'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; diff --git a/src/sql/workbench/parts/dataExplorer/common/nodeCommands.common.ts b/src/sql/workbench/parts/dataExplorer/browser/nodeCommands.common.ts similarity index 98% rename from src/sql/workbench/parts/dataExplorer/common/nodeCommands.common.ts rename to src/sql/workbench/parts/dataExplorer/browser/nodeCommands.common.ts index 5dc00b1a56..5e78edef01 100644 --- a/src/sql/workbench/parts/dataExplorer/common/nodeCommands.common.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/nodeCommands.common.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; import { ICustomViewDescriptor, TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IViewsRegistry, Extensions } from 'vs/workbench/common/views'; diff --git a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts b/src/sql/workbench/parts/dataExplorer/browser/nodeContext.ts similarity index 98% rename from src/sql/workbench/parts/dataExplorer/common/nodeContext.ts rename to src/sql/workbench/parts/dataExplorer/browser/nodeContext.ts index 6c2ca11378..14d8fb87d7 100644 --- a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/nodeContext.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; import { ITreeItem } from 'sql/workbench/common/views'; import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; diff --git a/src/sql/workbench/parts/dataExplorer/common/nodeContextUtils.ts b/src/sql/workbench/parts/dataExplorer/browser/nodeContextUtils.ts similarity index 99% rename from src/sql/workbench/parts/dataExplorer/common/nodeContextUtils.ts rename to src/sql/workbench/parts/dataExplorer/browser/nodeContextUtils.ts index dbd1466ac8..33b800f9af 100644 --- a/src/sql/workbench/parts/dataExplorer/common/nodeContextUtils.ts +++ b/src/sql/workbench/parts/dataExplorer/browser/nodeContextUtils.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/common/nodeContext'; +import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { Disposable } from 'vs/base/common/lifecycle'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/workbench/parts/notebook/browser/cellToggleMoreActions.ts b/src/sql/workbench/parts/notebook/browser/cellToggleMoreActions.ts index f4250c6bb6..04bb050169 100644 --- a/src/sql/workbench/parts/notebook/browser/cellToggleMoreActions.ts +++ b/src/sql/workbench/parts/notebook/browser/cellToggleMoreActions.ts @@ -12,13 +12,13 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import * as DOM from 'vs/base/browser/dom'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { CellActionBase, CellContext } from 'sql/workbench/parts/notebook/browser/cellViews/codeActions'; import { CellTypes, CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { ToggleMoreWidgetAction } from 'sql/workbench/parts/dashboard/browser/core/actions'; -import { CellModel } from 'sql/workbench/parts/notebook/common/models/cell'; +import { CellModel } from 'sql/workbench/parts/notebook/browser/models/cell'; export const HIDDEN_CLASS = 'actionhidden'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts b/src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts index 6700b0e9ba..ae821fcc88 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/code.component.ts @@ -9,10 +9,10 @@ import { OnInit, Component, Input, Inject, ElementRef, ViewChild, Output, EventE import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { QueryTextEditor } from 'sql/workbench/browser/modelComponents/queryTextEditor'; import { CellToggleMoreActions } from 'sql/workbench/parts/notebook/browser/cellToggleMoreActions'; -import { ICellModel, notebookConstants, CellExecutionState } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel, notebookConstants, CellExecutionState } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { RunCellAction, CellContext } from 'sql/workbench/parts/notebook/browser/cellViews/codeActions'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import * as themeColors from 'vs/workbench/common/theme'; @@ -28,8 +28,8 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { Event, Emitter } from 'vs/base/common/event'; import { CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { OVERRIDE_EDITOR_THEMING_SETTING } from 'sql/workbench/services/notebook/common/notebookService'; -import * as notebookUtils from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import { OVERRIDE_EDITOR_THEMING_SETTING } from 'sql/workbench/services/notebook/browser/notebookService'; +import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/codeActions.ts b/src/sql/workbench/parts/notebook/browser/cellViews/codeActions.ts index afc983e9c9..48bde437be 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/codeActions.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/codeActions.ts @@ -9,8 +9,8 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import * as types from 'vs/base/common/types'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; -import { ICellModel, CellExecutionState } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { ICellModel, CellExecutionState } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { MultiStateAction, IMultiStateData } from 'sql/workbench/parts/notebook/browser/notebookActions'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.ts b/src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.ts index 8ad8d88ff9..f53670e437 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/codeCell.component.ts @@ -6,8 +6,8 @@ import { nb } from 'azdata'; import { OnInit, Component, Input, Inject, forwardRef, ChangeDetectorRef, SimpleChange, OnChanges, HostListener } from '@angular/core'; import { CellView } from 'sql/workbench/parts/notebook/browser/cellViews/interfaces'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; import { Deferred } from 'sql/base/common/promise'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive.ts b/src/sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive.ts index 6654116759..a02a8218bd 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/linkHandler.directive.ts @@ -8,7 +8,7 @@ import { Directive, Inject, HostListener, Input } from '@angular/core'; import { URI } from 'vs/base/common/uri'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { onUnexpectedError } from 'vs/base/common/errors'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; const knownSchemes = new Set(['http', 'https', 'file', 'mailto', 'data', 'azuredatastudio', 'azuredatastudio-insiders', 'vscode', 'vscode-insiders', 'vscode-resource']); @Directive({ @@ -72,4 +72,4 @@ export class LinkHandlerDirective { } return !!this.isTrusted && link.scheme === 'command'; } -} \ No newline at end of file +} diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts b/src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts index 497ef564b0..daccdcba78 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts @@ -9,7 +9,7 @@ import { OnInit, Component, Input, Inject, ElementRef, ViewChild, SimpleChange, import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { Event } from 'vs/base/common/event'; import { nb } from 'azdata'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import * as outputProcessor from 'sql/workbench/parts/notebook/browser/models/outputProcessor'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import * as DOM from 'vs/base/browser/dom'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.ts b/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.ts index 2f0b2d294d..729af6bdd3 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/outputArea.component.ts @@ -6,7 +6,7 @@ import 'vs/css!./code'; import 'vs/css!./outputArea'; import { OnInit, Component, Input, Inject, ElementRef, ViewChild, forwardRef, ChangeDetectorRef } from '@angular/core'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import * as themeColors from 'vs/workbench/common/theme'; import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.ts b/src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.ts index 767547bc35..5bd8103bc8 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/placeholderCell.component.ts @@ -6,8 +6,8 @@ import 'vs/css!./placeholder'; import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, SimpleChange, OnChanges } from '@angular/core'; import { CellView } from 'sql/workbench/parts/notebook/browser/cellViews/interfaces'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; import { localize } from 'vs/nls'; import { CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; diff --git a/src/sql/workbench/parts/notebook/browser/cellViews/stdin.component.ts b/src/sql/workbench/parts/notebook/browser/cellViews/stdin.component.ts index c335f9aca7..ae59685619 100644 --- a/src/sql/workbench/parts/notebook/browser/cellViews/stdin.component.ts +++ b/src/sql/workbench/parts/notebook/browser/cellViews/stdin.component.ts @@ -23,7 +23,7 @@ import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { attachInputBoxStyler } from 'sql/platform/theme/common/styler'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { Deferred } from 'sql/base/common/promise'; -import { ICellModel, CellExecutionState } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel, CellExecutionState } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; export const STDIN_SELECTOR: string = 'stdin-component'; @Component({ diff --git a/src/sql/workbench/parts/notebook/common/models/cell.ts b/src/sql/workbench/parts/notebook/browser/models/cell.ts similarity index 98% rename from src/sql/workbench/parts/notebook/common/models/cell.ts rename to src/sql/workbench/parts/notebook/browser/models/cell.ts index 452a4f6f77..902fff8d4a 100644 --- a/src/sql/workbench/parts/notebook/common/models/cell.ts +++ b/src/sql/workbench/parts/notebook/browser/models/cell.ts @@ -9,15 +9,15 @@ import { Event, Emitter } from 'vs/base/common/event'; import { URI } from 'vs/base/common/uri'; import { localize } from 'vs/nls'; -import * as notebookUtils from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import { CellTypes, CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; -import { ICellModel, notebookConstants, IOutputChangedEvent, FutureInternal, CellExecutionState, ICellModelOptions } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { ICellModel, notebookConstants, IOutputChangedEvent, FutureInternal, CellExecutionState, ICellModelOptions } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { Schemas } from 'vs/base/common/network'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { optional } from 'vs/platform/instantiation/common/instantiation'; import { getErrorMessage } from 'vs/base/common/errors'; import { generateUuid } from 'vs/base/common/uuid'; diff --git a/src/sql/workbench/parts/notebook/common/models/cellMagicMapper.ts b/src/sql/workbench/parts/notebook/browser/models/cellMagicMapper.ts similarity index 93% rename from src/sql/workbench/parts/notebook/common/models/cellMagicMapper.ts rename to src/sql/workbench/parts/notebook/browser/models/cellMagicMapper.ts index ff91484ad0..542f0794a9 100644 --- a/src/sql/workbench/parts/notebook/common/models/cellMagicMapper.ts +++ b/src/sql/workbench/parts/notebook/browser/models/cellMagicMapper.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ICellMagicMapper } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; -import { ILanguageMagic } from 'sql/workbench/services/notebook/common/notebookService'; +import { ICellMagicMapper } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ILanguageMagic } from 'sql/workbench/services/notebook/browser/notebookService'; const defaultKernel = '*'; export class CellMagicMapper implements ICellMagicMapper { diff --git a/src/sql/workbench/parts/notebook/common/models/clientSession.ts b/src/sql/workbench/parts/notebook/browser/models/clientSession.ts similarity index 99% rename from src/sql/workbench/parts/notebook/common/models/clientSession.ts rename to src/sql/workbench/parts/notebook/browser/models/clientSession.ts index 2128ec914b..455b4f2a4d 100644 --- a/src/sql/workbench/parts/notebook/common/models/clientSession.ts +++ b/src/sql/workbench/parts/notebook/browser/models/clientSession.ts @@ -11,9 +11,9 @@ import { Event, Emitter } from 'vs/base/common/event'; import { localize } from 'vs/nls'; import { getErrorMessage } from 'vs/base/common/errors'; -import { IClientSession, IKernelPreference, IClientSessionOptions } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { IClientSession, IKernelPreference, IClientSessionOptions } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { Deferred } from 'sql/base/common/promise'; -import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookManager } from 'sql/workbench/services/notebook/browser/notebookService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; type KernelChangeHandler = (kernel: nb.IKernelChangedArgs) => Promise; diff --git a/src/sql/workbench/parts/notebook/common/models/modelFactory.ts b/src/sql/workbench/parts/notebook/browser/models/modelFactory.ts similarity index 83% rename from src/sql/workbench/parts/notebook/common/models/modelFactory.ts rename to src/sql/workbench/parts/notebook/browser/models/modelFactory.ts index f1d3c338c4..bce65c15d1 100644 --- a/src/sql/workbench/parts/notebook/common/models/modelFactory.ts +++ b/src/sql/workbench/parts/notebook/browser/models/modelFactory.ts @@ -5,9 +5,9 @@ import { nb } from 'azdata'; -import { CellModel } from 'sql/workbench/parts/notebook/common/models/cell'; -import { IClientSession, IClientSessionOptions, ICellModelOptions, ICellModel, IModelFactory } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; -import { ClientSession } from 'sql/workbench/parts/notebook/common/models/clientSession'; +import { CellModel } from 'sql/workbench/parts/notebook/browser/models/cell'; +import { IClientSession, IClientSessionOptions, ICellModelOptions, ICellModel, IModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ClientSession } from 'sql/workbench/parts/notebook/browser/models/clientSession'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; export class ModelFactory implements IModelFactory { diff --git a/src/sql/workbench/parts/notebook/common/models/modelInterfaces.ts b/src/sql/workbench/parts/notebook/browser/models/modelInterfaces.ts similarity index 98% rename from src/sql/workbench/parts/notebook/common/models/modelInterfaces.ts rename to src/sql/workbench/parts/notebook/browser/models/modelInterfaces.ts index 72abd9c247..4d2cc490ad 100644 --- a/src/sql/workbench/parts/notebook/common/models/modelInterfaces.ts +++ b/src/sql/workbench/parts/notebook/browser/models/modelInterfaces.ts @@ -12,15 +12,15 @@ import { URI } from 'vs/base/common/uri'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { CellType, NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { INotebookManager, ILanguageMagic } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookManager, ILanguageMagic } from 'sql/workbench/services/notebook/browser/notebookService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { localize } from 'vs/nls'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { IModelContentChangedEvent } from 'vs/editor/common/model/textModelEvents'; diff --git a/src/sql/workbench/parts/notebook/common/models/notebookContexts.ts b/src/sql/workbench/parts/notebook/browser/models/notebookContexts.ts similarity index 99% rename from src/sql/workbench/parts/notebook/common/models/notebookContexts.ts rename to src/sql/workbench/parts/notebook/browser/models/notebookContexts.ts index b3ad4f5b00..b33414110b 100644 --- a/src/sql/workbench/parts/notebook/common/models/notebookContexts.ts +++ b/src/sql/workbench/parts/notebook/browser/models/notebookContexts.ts @@ -6,7 +6,7 @@ import { nb } from 'azdata'; import { localize } from 'vs/nls'; -import { IDefaultConnection, notebookConstants } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { IDefaultConnection, notebookConstants } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/notebook/browser/models/notebookInput.ts b/src/sql/workbench/parts/notebook/browser/models/notebookInput.ts index bc6cc648ad..281a13263a 100644 --- a/src/sql/workbench/parts/notebook/browser/models/notebookInput.ts +++ b/src/sql/workbench/parts/notebook/browser/models/notebookInput.ts @@ -10,11 +10,11 @@ import { URI } from 'vs/base/common/uri'; import * as resources from 'vs/base/common/resources'; import * as azdata from 'azdata'; -import { IStandardKernelWithProvider, getProvidersForFileName, getStandardKernelsForProvider } from 'sql/workbench/parts/notebook/common/models/notebookUtils'; -import { INotebookService, DEFAULT_NOTEBOOK_PROVIDER, IProviderInfo } from 'sql/workbench/services/notebook/common/notebookService'; +import { IStandardKernelWithProvider, getProvidersForFileName, getStandardKernelsForProvider } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; +import { INotebookService, DEFAULT_NOTEBOOK_PROVIDER, IProviderInfo } from 'sql/workbench/services/notebook/browser/notebookService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITextModelService } from 'vs/editor/common/services/resolverService'; -import { INotebookModel, IContentManager, NotebookContentChange } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { INotebookModel, IContentManager, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel'; import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel'; import { Schemas } from 'vs/base/common/network'; @@ -26,7 +26,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten import { IDisposable } from 'vs/base/common/lifecycle'; import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; import { Deferred } from 'sql/base/common/promise'; -import { NotebookTextFileModel } from 'sql/workbench/parts/notebook/common/models/notebookTextFileModel'; +import { NotebookTextFileModel } from 'sql/workbench/parts/notebook/browser/models/notebookTextFileModel'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; export type ModeViewSaveHandler = (handle: number) => Thenable; diff --git a/src/sql/workbench/parts/notebook/common/models/notebookModel.ts b/src/sql/workbench/parts/notebook/browser/models/notebookModel.ts similarity index 99% rename from src/sql/workbench/parts/notebook/common/models/notebookModel.ts rename to src/sql/workbench/parts/notebook/browser/models/notebookModel.ts index a24ee081b5..9e7f6a4065 100644 --- a/src/sql/workbench/parts/notebook/common/models/notebookModel.ts +++ b/src/sql/workbench/parts/notebook/browser/models/notebookModel.ts @@ -9,13 +9,13 @@ import { localize } from 'vs/nls'; import { Event, Emitter } from 'vs/base/common/event'; import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; -import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, NotebookContentChange, notebookConstants, INotebookContentsEditable } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, NotebookContentChange, notebookConstants, INotebookContentsEditable } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { NotebookChangeType, CellType, CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; import { nbversion } from 'sql/workbench/parts/notebook/common/models/notebookConstants'; -import * as notebookUtils from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; -import { NotebookContexts } from 'sql/workbench/parts/notebook/common/models/notebookContexts'; +import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/browser/notebookService'; +import { NotebookContexts } from 'sql/workbench/parts/notebook/browser/models/notebookContexts'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { INotification, Severity, INotificationService } from 'vs/platform/notification/common/notification'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/workbench/parts/notebook/common/models/notebookTextFileModel.ts b/src/sql/workbench/parts/notebook/browser/models/notebookTextFileModel.ts similarity index 99% rename from src/sql/workbench/parts/notebook/common/models/notebookTextFileModel.ts rename to src/sql/workbench/parts/notebook/browser/models/notebookTextFileModel.ts index e443a451ac..ebfdd7dc30 100644 --- a/src/sql/workbench/parts/notebook/common/models/notebookTextFileModel.ts +++ b/src/sql/workbench/parts/notebook/browser/models/notebookTextFileModel.ts @@ -7,7 +7,7 @@ import { Range, IRange } from 'vs/editor/common/core/range'; import { UntitledEditorModel } from 'vs/workbench/common/editor/untitledEditorModel'; import { TextFileEditorModel } from 'vs/workbench/services/textfile/common/textFileEditorModel'; import { FindMatch } from 'vs/editor/common/model'; -import { NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { NotebookContentChange, INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; export class NotebookTextFileModel { diff --git a/src/sql/workbench/parts/notebook/common/models/notebookUtils.ts b/src/sql/workbench/parts/notebook/browser/models/notebookUtils.ts similarity index 97% rename from src/sql/workbench/parts/notebook/common/models/notebookUtils.ts rename to src/sql/workbench/parts/notebook/browser/models/notebookUtils.ts index c07f7df847..405639b2ed 100644 --- a/src/sql/workbench/parts/notebook/common/models/notebookUtils.ts +++ b/src/sql/workbench/parts/notebook/browser/models/notebookUtils.ts @@ -5,10 +5,10 @@ import * as path from 'vs/base/common/path'; import { nb, ServerInfo } from 'azdata'; -import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/workbench/parts/notebook/browser/notebook.common.contribution.ts b/src/sql/workbench/parts/notebook/browser/notebook.common.contribution.ts index e73da3d346..cd833c9e67 100644 --- a/src/sql/workbench/parts/notebook/browser/notebook.common.contribution.ts +++ b/src/sql/workbench/parts/notebook/browser/notebook.common.contribution.ts @@ -25,8 +25,8 @@ import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common import { IWindowService } from 'vs/platform/windows/common/windows'; import { IViewContainersRegistry, Extensions as ViewContainerExtensions, ViewContainer } from 'vs/workbench/common/views'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/common/nodeContext'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/browser/nodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; @@ -35,7 +35,7 @@ import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/tr import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; -import { ManageActionContext } from 'sql/workbench/common/actions'; +import { ManageActionContext } from 'sql/workbench/browser/actions'; // Model View editor registration const viewModelEditorDescriptor = new EditorDescriptor( diff --git a/src/sql/workbench/parts/notebook/browser/notebook.component.ts b/src/sql/workbench/parts/notebook/browser/notebook.component.ts index 0e72de00f8..ac58407284 100644 --- a/src/sql/workbench/parts/notebook/browser/notebook.component.ts +++ b/src/sql/workbench/parts/notebook/browser/notebook.component.ts @@ -23,24 +23,24 @@ import * as DOM from 'vs/base/browser/dom'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { CellTypes, CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { ICellModel, IModelFactory, INotebookModel, NotebookContentChange } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel, IModelFactory, INotebookModel, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER, INotebookSection, INavigationProvider } from 'sql/workbench/services/notebook/common/notebookService'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; -import { ModelFactory } from 'sql/workbench/parts/notebook/common/models/modelFactory'; -import * as notebookUtils from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER, INotebookSection, INavigationProvider } from 'sql/workbench/services/notebook/browser/notebookService'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; +import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import { Deferred } from 'sql/base/common/promise'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, RunAllCellsAction, ClearAllOutputsAction } from 'sql/workbench/parts/notebook/browser/notebookActions'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { CellMagicMapper } from 'sql/workbench/parts/notebook/common/models/cellMagicMapper'; +import { CellMagicMapper } from 'sql/workbench/parts/notebook/browser/models/cellMagicMapper'; import { IExtensionsViewlet, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions'; -import { CellModel } from 'sql/workbench/parts/notebook/common/models/cell'; +import { CellModel } from 'sql/workbench/parts/notebook/browser/models/cell'; import { FileOperationError, FileOperationResult } from 'vs/platform/files/common/files'; import { isValidBasename } from 'vs/base/common/extpath'; import { basename } from 'vs/base/common/resources'; diff --git a/src/sql/workbench/parts/notebook/browser/notebookActions.ts b/src/sql/workbench/parts/notebook/browser/notebookActions.ts index bde5c416dc..90df2af0cd 100644 --- a/src/sql/workbench/parts/notebook/browser/notebookActions.ts +++ b/src/sql/workbench/parts/notebook/browser/notebookActions.ts @@ -14,9 +14,9 @@ import { SelectBox, ISelectBoxOptionsWithLabel } from 'sql/base/browser/ui/selec import { IConnectionManagementService, ConnectionType } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { noKernel } from 'sql/workbench/services/notebook/common/sessionManager'; +import { noKernel } from 'sql/workbench/services/notebook/browser/sessionManager'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; import { generateUri } from 'sql/platform/connection/common/utils'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ILogService } from 'vs/platform/log/common/log'; @@ -24,7 +24,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; import { NotebookComponent } from 'sql/workbench/parts/notebook/browser/notebook.component'; import { getErrorMessage } from 'vs/base/common/errors'; -import { INotebookModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { INotebookModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; const msgLoading = localize('loading', "Loading kernels..."); const msgChanging = localize('changing', "Changing kernel..."); diff --git a/src/sql/workbench/parts/notebook/browser/notebookEditor.ts b/src/sql/workbench/parts/notebook/browser/notebookEditor.ts index 7f1940cd17..ad46ffe55a 100644 --- a/src/sql/workbench/parts/notebook/browser/notebookEditor.ts +++ b/src/sql/workbench/parts/notebook/browser/notebookEditor.ts @@ -14,7 +14,7 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; import { NotebookModule } from 'sql/workbench/parts/notebook/browser/notebook.module'; import { NOTEBOOK_SELECTOR } from 'sql/workbench/parts/notebook/browser/notebook.component'; -import { INotebookParams } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookParams } from 'sql/workbench/services/notebook/browser/notebookService'; import { IStorageService } from 'vs/platform/storage/common/storage'; export class NotebookEditor extends BaseEditor { diff --git a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts b/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts index c880e83967..d0ce271d75 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts +++ b/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts @@ -13,7 +13,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; -import { IDataResource } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager'; +import { IDataResource } from 'sql/workbench/services/notebook/browser/sql/sqlSessionManager'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/platform/query/common/queryRunner'; import { INotificationService } from 'vs/platform/notification/common/notification'; @@ -24,7 +24,7 @@ import { localize } from 'vs/nls'; import { IAction } from 'vs/base/common/actions'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; import { GridTableState } from 'sql/workbench/parts/query/common/gridPanelState'; import { GridTableBase } from 'sql/workbench/parts/query/browser/gridPanel'; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts b/src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts index f5f6ecaf65..d46d544596 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts +++ b/src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts @@ -8,7 +8,7 @@ import * as platform from 'vs/platform/registry/common/platform'; import { ReadonlyJSONObject } from 'sql/workbench/parts/notebook/common/models/jsonext'; import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; import * as types from 'vs/base/common/types'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; export type FactoryIdentifier = string; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts b/src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts index 547cf0094e..6997fdfe81 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts +++ b/src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts @@ -7,7 +7,7 @@ import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mim import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { ElementRef, forwardRef, Inject, Component, OnInit, Input } from '@angular/core'; import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry'; import { localize } from 'vs/nls'; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts b/src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts index f0b8e01300..d73a1c9353 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts +++ b/src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts @@ -10,7 +10,7 @@ import { localize } from 'vs/nls'; import * as types from 'vs/base/common/types'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; import { getErrorMessage } from 'vs/base/common/errors'; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts b/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts index 1db409d0f5..5d4d9b6977 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts +++ b/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts @@ -8,7 +8,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { textFormatter } from 'sql/base/browser/ui/table/formatters'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { escape } from 'sql/base/common/strings'; -import { IDataResource } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager'; +import { IDataResource } from 'sql/workbench/services/notebook/browser/sql/sqlSessionManager'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin'; diff --git a/src/sql/workbench/parts/notebook/electron-browser/cellViews/textCell.component.ts b/src/sql/workbench/parts/notebook/electron-browser/cellViews/textCell.component.ts index decc9b2249..9f28bbe568 100644 --- a/src/sql/workbench/parts/notebook/electron-browser/cellViews/textCell.component.ts +++ b/src/sql/workbench/parts/notebook/electron-browser/cellViews/textCell.component.ts @@ -23,12 +23,12 @@ import { IMarkdownRenderResult } from 'vs/editor/contrib/markdown/markdownRender import { IOpenerService } from 'vs/platform/opener/common/opener'; import { NotebookMarkdownRenderer } from 'sql/workbench/parts/notebook/electron-browser/outputs/notebookMarkdown'; import { CellView } from 'sql/workbench/parts/notebook/browser/cellViews/interfaces'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; import { ISanitizer, defaultSanitizer } from 'sql/workbench/parts/notebook/browser/outputs/sanitizer'; import { CellToggleMoreActions } from 'sql/workbench/parts/notebook/browser/cellToggleMoreActions'; import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service'; -import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; export const TEXT_SELECTOR: string = 'text-cell-component'; const USER_SELECT_CLASS = 'actionselect'; diff --git a/src/sql/workbench/parts/notebook/electron-browser/outputs/markdownOutput.component.ts b/src/sql/workbench/parts/notebook/electron-browser/outputs/markdownOutput.component.ts index 684d22b054..ae4a68cdc2 100644 --- a/src/sql/workbench/parts/notebook/electron-browser/outputs/markdownOutput.component.ts +++ b/src/sql/workbench/parts/notebook/electron-browser/outputs/markdownOutput.component.ts @@ -12,13 +12,13 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { ISanitizer, defaultSanitizer } from 'sql/workbench/parts/notebook/browser/outputs/sanitizer'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { NotebookMarkdownRenderer } from 'sql/workbench/parts/notebook/electron-browser/outputs/notebookMarkdown'; import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; -import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import { URI } from 'vs/base/common/uri'; @Component({ diff --git a/src/sql/workbench/parts/notebook/test/common/notebookEditorModel.test.ts b/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/common/notebookEditorModel.test.ts rename to src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts index 963220feb1..995880a5ca 100644 --- a/src/sql/workbench/parts/notebook/test/common/notebookEditorModel.test.ts +++ b/src/sql/workbench/parts/notebook/test/browser/notebookEditorModel.test.ts @@ -8,14 +8,14 @@ import * as TypeMoq from 'typemoq'; import * as os from 'os'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; -import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; -import { CellModel } from 'sql/workbench/parts/notebook/common/models/cell'; +import { ConnectionManagementService } from 'sql/platform/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/common/models/modelFactory'; -import { INotebookModelOptions, NotebookContentChange } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; +import { INotebookModelOptions, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { NotebookEditorModel } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; -import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { NotebookService } from 'sql/workbench/services/notebook/browser/notebookServiceImpl'; import { URI } from 'vs/base/common/uri'; import { toResource } from 'vs/base/test/common/utils'; import { IModelService } from 'vs/editor/common/services/modelService'; @@ -32,7 +32,7 @@ import { TestEnvironmentService, TestLifecycleService, TestStorageService, TestT import { Range } from 'vs/editor/common/core/range'; import { nb } from 'azdata'; import { Emitter } from 'vs/base/common/event'; -import { INotebookEditor, INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookEditor, INotebookManager } from 'sql/workbench/services/notebook/browser/notebookService'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; diff --git a/src/sql/workbench/parts/notebook/test/node/cell.test.ts b/src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/node/cell.test.ts rename to src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts index 4437dc5b7d..0d40387493 100644 --- a/src/sql/workbench/parts/notebook/test/node/cell.test.ts +++ b/src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts @@ -10,10 +10,10 @@ import { nb } from 'azdata'; import * as objects from 'vs/base/common/objects'; import { CellTypes } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { ModelFactory } from 'sql/workbench/parts/notebook/common/models/modelFactory'; +import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; import { NotebookModelStub } from './common'; -import { EmptyFuture } from 'sql/workbench/services/notebook/common/sessionManager'; -import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { EmptyFuture } from 'sql/workbench/services/notebook/browser/sessionManager'; +import { ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { Deferred } from 'sql/base/common/promise'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/parts/notebook/test/node/clientSession.test.ts b/src/sql/workbench/parts/notebook/test/electron-browser/clientSession.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/node/clientSession.test.ts rename to src/sql/workbench/parts/notebook/test/electron-browser/clientSession.test.ts index 03e956d161..28da9f4a09 100644 --- a/src/sql/workbench/parts/notebook/test/node/clientSession.test.ts +++ b/src/sql/workbench/parts/notebook/test/electron-browser/clientSession.test.ts @@ -11,8 +11,8 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import { URI } from 'vs/base/common/uri'; -import { ClientSession } from 'sql/workbench/parts/notebook/common/models/clientSession'; -import { SessionManager, EmptySession } from 'sql/workbench/services/notebook/common/sessionManager'; +import { ClientSession } from 'sql/workbench/parts/notebook/browser/models/clientSession'; +import { SessionManager, EmptySession } from 'sql/workbench/services/notebook/browser/sessionManager'; import { NotebookManagerStub, ServerManagerStub } from './common'; suite('Client Session', function (): void { diff --git a/src/sql/workbench/parts/notebook/test/node/common.ts b/src/sql/workbench/parts/notebook/test/electron-browser/common.ts similarity index 97% rename from src/sql/workbench/parts/notebook/test/node/common.ts rename to src/sql/workbench/parts/notebook/test/electron-browser/common.ts index 8016e39ae1..06266d44c8 100644 --- a/src/sql/workbench/parts/notebook/test/node/common.ts +++ b/src/sql/workbench/parts/notebook/test/electron-browser/common.ts @@ -6,11 +6,11 @@ import { nb, IConnectionProfile } from 'azdata'; import { Event, Emitter } from 'vs/base/common/event'; -import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { NotebookChangeType, CellType } from 'sql/workbench/parts/notebook/common/models/contracts'; -import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookManager } from 'sql/workbench/services/notebook/browser/notebookService'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import { IStandardKernelWithProvider } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; export class NotebookModelStub implements INotebookModel { constructor(private _languageInfo?: nb.ILanguageInfo) { diff --git a/src/sql/workbench/parts/notebook/test/node/contentManagers.test.ts b/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts similarity index 99% rename from src/sql/workbench/parts/notebook/test/node/contentManagers.test.ts rename to src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts index a298c47c52..d25d22f560 100644 --- a/src/sql/workbench/parts/notebook/test/node/contentManagers.test.ts +++ b/src/sql/workbench/parts/notebook/test/electron-browser/contentManagers.test.ts @@ -5,7 +5,6 @@ import * as should from 'should'; import { nb } from 'azdata'; -import * as typemoq from 'typemoq'; import { URI } from 'vs/base/common/uri'; import * as tempWrite from 'temp-write'; diff --git a/src/sql/workbench/parts/notebook/test/node/notebookModel.test.ts b/src/sql/workbench/parts/notebook/test/electron-browser/notebookModel.test.ts similarity index 94% rename from src/sql/workbench/parts/notebook/test/node/notebookModel.test.ts rename to src/sql/workbench/parts/notebook/test/electron-browser/notebookModel.test.ts index e39c08a509..8640a2020d 100644 --- a/src/sql/workbench/parts/notebook/test/node/notebookModel.test.ts +++ b/src/sql/workbench/parts/notebook/test/electron-browser/notebookModel.test.ts @@ -13,13 +13,12 @@ import { URI } from 'vs/base/common/uri'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; import { NotebookManagerStub } from './common'; -import { NotebookModel } from 'sql/workbench/parts/notebook/common/models/notebookModel'; -import { ModelFactory } from 'sql/workbench/parts/notebook/common/models/modelFactory'; -import { IClientSession, ICellModel, INotebookModelOptions, NotebookContentChange } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; -import { ClientSession } from 'sql/workbench/parts/notebook/common/models/clientSession'; +import { NotebookModel } from 'sql/workbench/parts/notebook/browser/models/notebookModel'; +import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; +import { IClientSession, ICellModel, INotebookModelOptions, NotebookContentChange } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; +import { ClientSession } from 'sql/workbench/parts/notebook/browser/models/clientSession'; import { CellTypes, NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts'; import { Deferred } from 'sql/base/common/promise'; -import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { Memento } from 'vs/workbench/common/memento'; import { Emitter } from 'vs/base/common/event'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; @@ -28,8 +27,8 @@ import { TestStorageService } from 'vs/workbench/test/workbenchTestServices'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; -import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { NullLogService } from 'vs/platform/log/common/log'; +import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; let expectedNotebookContent: nb.INotebookContents = { cells: [{ @@ -82,7 +81,7 @@ let instantiationService: IInstantiationService; suite('notebook model', function (): void { let notebookManagers = [new NotebookManagerStub()]; let memento: TypeMoq.Mock; - let queryConnectionService: TypeMoq.Mock; + let queryConnectionService: TypeMoq.Mock; let defaultModelOptions: INotebookModelOptions; const logService = new NullLogService(); setup(() => { @@ -91,7 +90,7 @@ suite('notebook model', function (): void { capabilitiesService = TypeMoq.Mock.ofType(TestCapabilitiesService); memento = TypeMoq.Mock.ofType(Memento, TypeMoq.MockBehavior.Loose, ''); memento.setup(x => x.getMemento(TypeMoq.It.isAny())).returns(() => void 0); - queryConnectionService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, memento.object, undefined, new TestStorageService()); + queryConnectionService = TypeMoq.Mock.ofType(TestConnectionManagementService, TypeMoq.MockBehavior.Loose, memento.object, undefined, new TestStorageService()); queryConnectionService.callBase = true; let serviceCollection = new ServiceCollection(); instantiationService = new InstantiationService(serviceCollection, true); diff --git a/src/sql/workbench/parts/notebook/test/node/notebookUtils.test.ts b/src/sql/workbench/parts/notebook/test/electron-browser/notebookUtils.test.ts similarity index 98% rename from src/sql/workbench/parts/notebook/test/node/notebookUtils.test.ts rename to src/sql/workbench/parts/notebook/test/electron-browser/notebookUtils.test.ts index 500a6275df..c91295a815 100644 --- a/src/sql/workbench/parts/notebook/test/node/notebookUtils.test.ts +++ b/src/sql/workbench/parts/notebook/test/electron-browser/notebookUtils.test.ts @@ -8,7 +8,7 @@ import { IConnectionProfile } from 'azdata'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { formatServerNameWithDatabaseNameForAttachTo, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import { formatServerNameWithDatabaseNameForAttachTo, getServerFromFormattedAttachToName, getDatabaseFromFormattedAttachToName } from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; suite('notebookUtils', function (): void { diff --git a/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts b/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts index 1d32b2c343..8170923697 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/connectionTreeAction.ts @@ -14,7 +14,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; import { ITree } from 'vs/base/parts/tree/browser/tree'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import Severity from 'vs/base/common/severity'; import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts b/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts index 3f9d2fddf7..2c3515b30f 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/objectExplorerActions.ts @@ -12,7 +12,7 @@ import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim.ts b/src/sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim.ts similarity index 98% rename from src/sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim.ts rename to src/sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim.ts index 9658ad04da..b13cf14991 100644 --- a/src/sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim.ts @@ -6,11 +6,11 @@ import * as azdata from 'azdata'; import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { ConnectionType, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ITreeItem } from 'sql/workbench/common/views'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { hash } from 'vs/base/common/hash'; import { Disposable } from 'vs/base/common/lifecycle'; import { generateUuid } from 'vs/base/common/uuid'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts index 1837daedb9..9389ab01b9 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeDataSource.ts @@ -7,7 +7,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectio import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import Severity from 'vs/base/common/severity'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts b/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts index 8767d87252..89687bd9e9 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/serverTreeView.ts @@ -24,7 +24,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { TreeCreationUtils } from 'sql/workbench/parts/objectExplorer/browser/treeCreationUtils'; import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Button } from 'sql/base/browser/ui/button/button'; import { attachButtonStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts b/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts index 4806a94d45..9d5e763160 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts @@ -6,7 +6,7 @@ import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; // import { IProgressRunner, IProgressService } from 'vs/platform/progress/common/progress'; import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts b/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts index ae371b66ab..e6aa760ec3 100644 --- a/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts +++ b/src/sql/workbench/parts/objectExplorer/browser/treeUpdateUtils.ts @@ -7,7 +7,7 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectio import { IConnectionManagementService, IConnectionCompletionOptions, IConnectionCallbacks } from 'sql/platform/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts b/src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts index 9875e387e9..dcee2945ed 100644 --- a/src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts +++ b/src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts @@ -17,7 +17,7 @@ import { TestErrorMessageService } from 'sql/platform/errorMessage/test/common/t import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; import { ServerTreeView } from 'sql/workbench/parts/objectExplorer/browser/serverTreeView'; import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants'; -import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode'; import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; 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 68e8f9e17c..05ea7c0eee 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/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/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/profiler/browser/profiler.contribution.ts b/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts index 79eef45038..def0da2e19 100644 --- a/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts +++ b/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts @@ -12,7 +12,7 @@ import * as nls from 'vs/nls'; import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { ProfilerEditor } from 'sql/workbench/parts/profiler/browser/profilerEditor'; -import { PROFILER_VIEW_TEMPLATE_SETTINGS, PROFILER_SESSION_TEMPLATE_SETTINGS, IProfilerViewTemplate, IProfilerSessionTemplate, EngineType, PROFILER_FILTER_SETTINGS } from 'sql/workbench/services/profiler/common/interfaces'; +import { PROFILER_VIEW_TEMPLATE_SETTINGS, PROFILER_SESSION_TEMPLATE_SETTINGS, IProfilerViewTemplate, IProfilerSessionTemplate, EngineType, PROFILER_FILTER_SETTINGS } from 'sql/workbench/services/profiler/browser/interfaces'; const profilerDescriptor = new EditorDescriptor( ProfilerEditor, diff --git a/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts b/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts index e0028f483a..6439746b9f 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts @@ -9,7 +9,7 @@ import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/commo import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; -import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { ProfilerEditor } from 'sql/workbench/parts/profiler/browser/profilerEditor'; import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; @@ -17,7 +17,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; CommandsRegistry.registerCommand({ diff --git a/src/sql/workbench/parts/profiler/browser/profilerActions.ts b/src/sql/workbench/parts/profiler/browser/profilerActions.ts index 2bc25831a8..965674ea3b 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerActions.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerActions.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { IProfilerController } from 'sql/workbench/parts/profiler/common/interfaces'; import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerEditor.ts b/src/sql/workbench/parts/profiler/browser/profilerEditor.ts index 041306b6e7..59bc7640d8 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerEditor.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerEditor.ts @@ -7,7 +7,7 @@ import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInpu import { TabbedPanel } from 'sql/base/browser/ui/panel/panel'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/common/interfaces'; +import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/browser/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { attachTableStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; import { IProfilerStateChangedEvent } from 'sql/workbench/parts/profiler/common/profilerState'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts b/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts index 7bb7c4fa99..0a38a19e8f 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts @@ -22,7 +22,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView import { generateUuid } from 'vs/base/common/uuid'; import * as DOM from 'vs/base/browser/dom'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { ProfilerFilter, ProfilerFilterClause, ProfilerFilterClauseOperator, IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { ProfilerFilter, ProfilerFilterClause, ProfilerFilterClauseOperator, IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; diff --git a/src/sql/workbench/parts/profiler/browser/profilerInput.ts b/src/sql/workbench/parts/profiler/browser/profilerInput.ts index 9d85460540..4c6ab657d3 100644 --- a/src/sql/workbench/parts/profiler/browser/profilerInput.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerInput.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import { IProfilerSession, IProfilerService, ProfilerSessionID, IProfilerViewTemplate, ProfilerFilter } from 'sql/workbench/services/profiler/common/interfaces'; +import { IProfilerSession, IProfilerService, ProfilerSessionID, IProfilerViewTemplate, ProfilerFilter } from 'sql/workbench/services/profiler/browser/interfaces'; import { ProfilerState } from 'sql/workbench/parts/profiler/common/profilerState'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -21,7 +21,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import * as types from 'vs/base/common/types'; import { URI } from 'vs/base/common/uri'; import Severity from 'vs/base/common/severity'; -import { FilterData } from 'sql/workbench/services/profiler/common/profilerFilter'; +import { FilterData } from 'sql/workbench/services/profiler/browser/profilerFilter'; import { uriPrefixes } from 'sql/platform/connection/common/utils'; export class ProfilerInput extends EditorInput implements IProfilerSession { diff --git a/src/sql/workbench/parts/query/browser/query.contribution.ts b/src/sql/workbench/parts/query/browser/query.contribution.ts index dca9e6ee3e..f60d40af47 100644 --- a/src/sql/workbench/parts/query/browser/query.contribution.ts +++ b/src/sql/workbench/parts/query/browser/query.contribution.ts @@ -35,9 +35,9 @@ import { TimeElapsedStatusBarContributions, RowCountStatusBarContributions, Quer import { SqlFlavorStatusbarItem } from 'sql/workbench/parts/query/browser/flavorStatus'; import { NewQueryTask, OE_NEW_QUERY_ACTION_ID, DE_NEW_QUERY_COMMAND_ID } from 'sql/workbench/parts/query/browser/queryActions'; import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; -import { ManageActionContext } from 'sql/workbench/common/actions'; +import { ManageActionContext } from 'sql/workbench/browser/actions'; import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; const gridCommandsWeightBonus = 100; // give our commands a little bit more weight over other default list/tree commands diff --git a/src/sql/workbench/parts/query/browser/queryActions.ts b/src/sql/workbench/parts/query/browser/queryActions.ts index 35a1928f8b..e027057b0e 100644 --- a/src/sql/workbench/parts/query/browser/queryActions.ts +++ b/src/sql/workbench/parts/query/browser/queryActions.ts @@ -30,7 +30,7 @@ import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler'; import { Dropdown } from 'sql/base/parts/editableDropdown/browser/dropdown'; import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; 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 c7d24f5d5f..d23ff7d024 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/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/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 556a026bfa..950575b53f 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/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/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/restore/browser/restore.contribution.ts b/src/sql/workbench/parts/restore/browser/restore.contribution.ts index db964135c8..31afd66431 100644 --- a/src/sql/workbench/parts/restore/browser/restore.contribution.ts +++ b/src/sql/workbench/parts/restore/browser/restore.contribution.ts @@ -8,14 +8,14 @@ import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { localize } from 'vs/nls'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { RestoreAction } from 'sql/workbench/parts/restore/browser/restoreActions'; import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; -import { ManageActionContext } from 'sql/workbench/common/actions'; +import { ManageActionContext } from 'sql/workbench/browser/actions'; import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey'; diff --git a/src/sql/workbench/parts/restore/browser/restoreActions.ts b/src/sql/workbench/parts/restore/browser/restoreActions.ts index 7e5f524840..0a2a9b5e7c 100644 --- a/src/sql/workbench/parts/restore/browser/restoreActions.ts +++ b/src/sql/workbench/parts/restore/browser/restoreActions.ts @@ -12,7 +12,7 @@ import { IRestoreDialogController } from 'sql/platform/restore/common/restoreSer import { INotificationService } from 'vs/platform/notification/common/notification'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; diff --git a/src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts b/src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts index 2484002625..a4defeaa0d 100644 --- a/src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts +++ b/src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts @@ -5,7 +5,7 @@ import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; import * as commands from 'sql/workbench/parts/scripting/electron-browser/scriptingActions'; -import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext'; +import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { localize } from 'vs/nls'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey'; diff --git a/src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts b/src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts index 3d4032c173..e3c3e01131 100644 --- a/src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts +++ b/src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts @@ -8,16 +8,16 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IProgressService } from 'vs/platform/progress/common/progress'; -import { BaseActionContext } from 'sql/workbench/common/actions'; +import { BaseActionContext } from 'sql/workbench/browser/actions'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ScriptCreateAction, ScriptDeleteAction, ScriptSelectAction, ScriptExecuteAction, ScriptAlterAction, EditDataAction } from 'sql/workbench/electron-browser/scriptingActions'; import { ObjectExplorerActionsContext, getTreeNode } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { TreeSelectionHandler } from 'sql/workbench/parts/objectExplorer/browser/treeSelectionHandler'; import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils'; import Severity from 'vs/base/common/severity'; diff --git a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts index d9ca5c3399..18b41438ed 100644 --- a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts @@ -17,7 +17,7 @@ import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/workbench/parts/connection/browser/recentConnectionTreeController'; import { SavedConnectionTreeController } from 'sql/workbench/parts/connection/browser/savedConnectionTreeController'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { ClearRecentConnectionsAction } from 'sql/workbench/parts/connection/common/connectionActions'; +import { ClearRecentConnectionsAction } from 'sql/workbench/parts/connection/browser/connectionActions'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { contrastBorder } from 'vs/platform/theme/common/colorRegistry'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts b/src/sql/workbench/services/connection/test/browser/connectionDialogService.test.ts index ebc8b64faf..2c29f29c9a 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/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/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/workbench/services/insights/common/insightsDialogController.ts b/src/sql/workbench/services/insights/browser/insightsDialogController.ts similarity index 99% rename from src/sql/workbench/services/insights/common/insightsDialogController.ts rename to src/sql/workbench/services/insights/browser/insightsDialogController.ts index 36d1e58915..19adf95005 100644 --- a/src/sql/workbench/services/insights/common/insightsDialogController.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogController.ts @@ -8,7 +8,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import QueryRunner from 'sql/platform/query/common/queryRunner'; import * as Utils from 'sql/platform/connection/common/utils'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { resolveQueryFilePath } from './insightsUtils'; +import { resolveQueryFilePath } from '../common/insightsUtils'; import { DbCellValue, IDbColumn, QueryExecuteSubsetResult } from 'azdata'; diff --git a/src/sql/workbench/services/insights/browser/insightsDialogService.ts b/src/sql/workbench/services/insights/browser/insightsDialogService.ts index c521efa734..defa4950d0 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogService.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogService.ts @@ -6,7 +6,7 @@ import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { BaseActionContext } from 'sql/workbench/common/actions'; +import { BaseActionContext } from 'sql/workbench/browser/actions'; import { IInsightsConfigDetails, IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; export interface IInsightsDialogModel { diff --git a/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts b/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts index 7a679100bd..822a0fdac9 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts @@ -9,7 +9,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsDialogModel, IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; import { InsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogModel'; import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry'; -import { InsightsDialogController } from 'sql/workbench/services/insights/common/insightsDialogController'; +import { InsightsDialogController } from 'sql/workbench/services/insights/browser/insightsDialogController'; export class InsightsDialogService implements IInsightsDialogService { _serviceBrand: any; 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 28e22c7835..bd39aaeb2f 100644 --- a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts +++ b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { InsightsDialogController } from 'sql/workbench/services/insights/common/insightsDialogController'; +import { InsightsDialogController } from 'sql/workbench/services/insights/browser/insightsDialogController'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/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/common/notebookService.ts b/src/sql/workbench/services/notebook/browser/notebookService.ts similarity index 97% rename from src/sql/workbench/services/notebook/common/notebookService.ts rename to src/sql/workbench/services/notebook/browser/notebookService.ts index aae9425151..b95902e57e 100644 --- a/src/sql/workbench/services/notebook/common/notebookService.ts +++ b/src/sql/workbench/services/notebook/browser/notebookService.ts @@ -9,11 +9,11 @@ import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { URI } from 'vs/base/common/uri'; import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry'; -import { ModelFactory } from 'sql/workbench/parts/notebook/common/models/modelFactory'; +import { ModelFactory } from 'sql/workbench/parts/notebook/browser/models/modelFactory'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { ICellModel, INotebookModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +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'; diff --git a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts similarity index 99% rename from src/sql/workbench/services/notebook/common/notebookServiceImpl.ts rename to src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts index 4d46a10493..b7473a22b3 100644 --- a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts +++ b/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts @@ -11,7 +11,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { INotebookService, INotebookManager, INotebookProvider, DEFAULT_NOTEBOOK_FILETYPE, INotebookEditor, SQL_NOTEBOOK_PROVIDER, OVERRIDE_EDITOR_THEMING_SETTING, INavigationProvider, ILanguageMagic -} from 'sql/workbench/services/notebook/common/notebookService'; +} from 'sql/workbench/services/notebook/browser/notebookService'; import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry'; import { standardRendererFactories } from 'sql/workbench/parts/notebook/browser/outputs/factories'; import { Extensions, INotebookProviderRegistry, NotebookProviderRegistration } from 'sql/workbench/services/notebook/common/notebookRegistry'; @@ -30,9 +30,9 @@ import { NotebookEditor } from 'sql/workbench/parts/notebook/browser/notebookEdi import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { registerNotebookThemes } from 'sql/workbench/parts/notebook/browser/notebookStyles'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; -import { notebookConstants, ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { notebookConstants, ICellModel } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; -import { SqlNotebookProvider } from 'sql/workbench/services/notebook/common/sql/sqlNotebookProvider'; +import { SqlNotebookProvider } from 'sql/workbench/services/notebook/browser/sql/sqlNotebookProvider'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { keys } from 'vs/base/common/map'; import { IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files'; diff --git a/src/sql/workbench/services/notebook/common/sessionManager.ts b/src/sql/workbench/services/notebook/browser/sessionManager.ts similarity index 98% rename from src/sql/workbench/services/notebook/common/sessionManager.ts rename to src/sql/workbench/services/notebook/browser/sessionManager.ts index cd321f08b4..80d35f3c34 100644 --- a/src/sql/workbench/services/notebook/common/sessionManager.ts +++ b/src/sql/workbench/services/notebook/browser/sessionManager.ts @@ -5,7 +5,7 @@ import { nb } from 'azdata'; import { localize } from 'vs/nls'; -import { FutureInternal } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { FutureInternal } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; export const noKernel: string = localize('noKernel', "No Kernel"); @@ -226,4 +226,4 @@ export class EmptyFuture implements FutureInternal { removeMessageHook(hook: (msg: nb.IIOPubMessage) => boolean | Thenable): void { // no-op } -} \ No newline at end of file +} diff --git a/src/sql/workbench/services/notebook/common/sql/sqlNotebookManager.ts b/src/sql/workbench/services/notebook/browser/sql/sqlNotebookManager.ts similarity index 96% rename from src/sql/workbench/services/notebook/common/sql/sqlNotebookManager.ts rename to src/sql/workbench/services/notebook/browser/sql/sqlNotebookManager.ts index d06eb687d9..d930c9e188 100644 --- a/src/sql/workbench/services/notebook/common/sql/sqlNotebookManager.ts +++ b/src/sql/workbench/services/notebook/browser/sql/sqlNotebookManager.ts @@ -7,9 +7,9 @@ import { nb } from 'azdata'; import * as vscode from 'vscode'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; +import { SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/browser/notebookService'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; -import { SqlSessionManager } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager'; +import { SqlSessionManager } from 'sql/workbench/services/notebook/browser/sql/sqlSessionManager'; export class SqlNotebookManager implements nb.NotebookProvider { private _contentManager: nb.ContentManager; diff --git a/src/sql/workbench/services/notebook/common/sql/sqlNotebookProvider.ts b/src/sql/workbench/services/notebook/browser/sql/sqlNotebookProvider.ts similarity index 91% rename from src/sql/workbench/services/notebook/common/sql/sqlNotebookProvider.ts rename to src/sql/workbench/services/notebook/browser/sql/sqlNotebookProvider.ts index 250316794c..8a5847468a 100644 --- a/src/sql/workbench/services/notebook/common/sql/sqlNotebookProvider.ts +++ b/src/sql/workbench/services/notebook/browser/sql/sqlNotebookProvider.ts @@ -6,8 +6,8 @@ import { URI } from 'vs/base/common/uri'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INotebookManager, INotebookProvider, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; -import { SqlNotebookManager } from 'sql/workbench/services/notebook/common/sql/sqlNotebookManager'; +import { INotebookManager, INotebookProvider, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/browser/notebookService'; +import { SqlNotebookManager } from 'sql/workbench/services/notebook/browser/sql/sqlNotebookManager'; export class SqlNotebookProvider implements INotebookProvider { private manager: SqlNotebookManager; diff --git a/src/sql/workbench/services/notebook/common/sql/sqlSessionManager.ts b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts similarity index 99% rename from src/sql/workbench/services/notebook/common/sql/sqlSessionManager.ts rename to src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts index 7bfa75bcc5..23630be665 100644 --- a/src/sql/workbench/services/notebook/common/sql/sqlSessionManager.ts +++ b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts @@ -5,7 +5,7 @@ import { nb, QueryExecuteSubsetResult, IDbColumn, BatchSummary, IResultMessage, ResultSetSummary } from 'azdata'; import { localize } from 'vs/nls'; -import { FutureInternal, notebookConstants } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; +import { FutureInternal, notebookConstants } from 'sql/workbench/parts/notebook/browser/models/modelInterfaces'; import QueryRunner from 'sql/platform/query/common/queryRunner'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -16,12 +16,12 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { escape } from 'sql/base/common/strings'; -import * as notebookUtils from 'sql/workbench/parts/notebook/common/models/notebookUtils'; +import * as notebookUtils from 'sql/workbench/parts/notebook/browser/models/notebookUtils'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ILogService } from 'vs/platform/log/common/log'; import { isUndefinedOrNull } from 'vs/base/common/types'; -import { ILanguageMagic } from 'sql/workbench/services/notebook/common/notebookService'; +import { ILanguageMagic } from 'sql/workbench/services/notebook/browser/notebookService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; import { URI } from 'vs/base/common/uri'; import { getUriPrefix, uriPrefixes } from 'sql/platform/connection/common/utils'; diff --git a/src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts b/src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts similarity index 100% rename from src/sql/workbench/services/objectExplorer/common/objectExplorerService.ts rename to src/sql/workbench/services/objectExplorer/browser/objectExplorerService.ts diff --git a/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts b/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts index 6f9f55c460..6c69c1e220 100644 --- a/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts +++ b/src/sql/workbench/services/objectExplorer/test/browser/objectExplorerService.test.ts @@ -5,7 +5,7 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; -import { ObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { ObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType'; import { TreeNode, TreeItemCollapsibleState } from 'sql/workbench/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/workbench/services/profiler/common/interfaces.ts b/src/sql/workbench/services/profiler/browser/interfaces.ts similarity index 100% rename from src/sql/workbench/services/profiler/common/interfaces.ts rename to src/sql/workbench/services/profiler/browser/interfaces.ts diff --git a/src/sql/workbench/services/profiler/common/profilerFilter.ts b/src/sql/workbench/services/profiler/browser/profilerFilter.ts similarity index 98% rename from src/sql/workbench/services/profiler/common/profilerFilter.ts rename to src/sql/workbench/services/profiler/browser/profilerFilter.ts index 4c63a7d2fb..6a2a762c6a 100644 --- a/src/sql/workbench/services/profiler/common/profilerFilter.ts +++ b/src/sql/workbench/services/profiler/browser/profilerFilter.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ProfilerFilterClause, ProfilerFilter, ProfilerFilterClauseOperator } from 'sql/workbench/services/profiler/common/interfaces'; +import { ProfilerFilterClause, ProfilerFilter, ProfilerFilterClauseOperator } from 'sql/workbench/services/profiler/browser/interfaces'; export function FilterData(filter: ProfilerFilter, data: any[]): any[] { diff --git a/src/sql/workbench/services/profiler/browser/profilerService.ts b/src/sql/workbench/services/profiler/browser/profilerService.ts index a2f0e76446..03060566a5 100644 --- a/src/sql/workbench/services/profiler/browser/profilerService.ts +++ b/src/sql/workbench/services/profiler/browser/profilerService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; -import { ProfilerSessionID, IProfilerSession, IProfilerService, IProfilerViewTemplate, IProfilerSessionTemplate, PROFILER_SETTINGS, IProfilerSettings, EngineType, ProfilerFilter, PROFILER_FILTER_SETTINGS } from '../common/interfaces'; +import { ProfilerSessionID, IProfilerSession, IProfilerService, IProfilerViewTemplate, IProfilerSessionTemplate, PROFILER_SETTINGS, IProfilerSettings, EngineType, ProfilerFilter, PROFILER_FILTER_SETTINGS } from './interfaces'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { ProfilerColumnEditorDialog } from 'sql/workbench/parts/profiler/browser/profilerColumnEditorDialog'; diff --git a/src/sql/workbench/services/profiler/test/common/profilerFilter.test.ts b/src/sql/workbench/services/profiler/test/browser/profilerFilter.test.ts similarity index 97% rename from src/sql/workbench/services/profiler/test/common/profilerFilter.test.ts rename to src/sql/workbench/services/profiler/test/browser/profilerFilter.test.ts index 378639cd46..91e4c7a14a 100644 --- a/src/sql/workbench/services/profiler/test/common/profilerFilter.test.ts +++ b/src/sql/workbench/services/profiler/test/browser/profilerFilter.test.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as assert from 'assert'; -import { FilterData } from 'sql/workbench/services/profiler/common/profilerFilter'; -import { ProfilerFilterClauseOperator, ProfilerFilter } from 'sql/workbench/services/profiler/common/interfaces'; +import { FilterData } from 'sql/workbench/services/profiler/browser/profilerFilter'; +import { ProfilerFilterClauseOperator, ProfilerFilter } from 'sql/workbench/services/profiler/browser/interfaces'; const property1 = 'property1'; const property2 = 'property2'; @@ -117,4 +117,3 @@ interface TestData { property1: string; property2: string; } - diff --git a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts index 7e8b0d3bd3..0fcf675f30 100644 --- a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts +++ b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts @@ -9,7 +9,7 @@ import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInpu import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; -import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/workbench/common/customInputConverter'; +import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/workbench/browser/customInputConverter'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; import { ITextModel } from 'vs/editor/common/model'; diff --git a/src/sql/workbench/test/common/taskUtilities.test.ts b/src/sql/workbench/test/browser/taskUtilities.test.ts similarity index 99% rename from src/sql/workbench/test/common/taskUtilities.test.ts rename to src/sql/workbench/test/browser/taskUtilities.test.ts index 4908f77abc..8ed89491ca 100644 --- a/src/sql/workbench/test/common/taskUtilities.test.ts +++ b/src/sql/workbench/test/browser/taskUtilities.test.ts @@ -6,7 +6,7 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import * as TaskUtilities from 'sql/workbench/browser/taskUtilities'; -import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/test/electron-browser/api/mainThreadNotebook.test.ts b/src/sql/workbench/test/electron-browser/api/mainThreadNotebook.test.ts index d9807b9da2..707c321537 100644 --- a/src/sql/workbench/test/electron-browser/api/mainThreadNotebook.test.ts +++ b/src/sql/workbench/test/electron-browser/api/mainThreadNotebook.test.ts @@ -11,8 +11,8 @@ import { URI, UriComponents } from 'vs/base/common/uri'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { MainThreadNotebook } from 'sql/workbench/api/browser/mainThreadNotebook'; -import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; -import { INotebookProvider } from 'sql/workbench/services/notebook/common/notebookService'; +import { NotebookService } from 'sql/workbench/services/notebook/browser/notebookServiceImpl'; +import { INotebookProvider } from 'sql/workbench/services/notebook/browser/notebookService'; import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, INotebookFutureDetails } from 'sql/workbench/api/common/sqlExtHostTypes'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; import { TestLifecycleService, TestEnvironmentService } from 'vs/workbench/test/workbenchTestServices'; diff --git a/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts index 17522b6ad6..0c49b756ff 100644 --- a/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/browser/mainThreadSaveParticipant.ts @@ -36,7 +36,7 @@ import { ISaveParticipant, SaveReason, IResolvedTextFileEditorModel, ITextFileEd import { ExtHostContext, ExtHostDocumentSaveParticipantShape, IExtHostContext } from '../common/extHost.protocol'; // {{SQL CARBON EDIT}} -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; /* diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index 4b66aa0038..d22e2474bd 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/src/vs/workbench/common/editor/editorGroup.ts @@ -16,7 +16,7 @@ import { coalesce } from 'vs/base/common/arrays'; // {{SQL CARBON EDIT}} import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import * as CustomInputConverter from 'sql/workbench/common/customInputConverter'; +import * as CustomInputConverter from 'sql/workbench/browser/customInputConverter'; import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput'; diff --git a/src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts b/src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts index 7e9d010438..5ef2a9831d 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionTipsService.ts @@ -17,7 +17,7 @@ import { IStorageService, StorageScope } from 'vs/platform/storage/common/storag import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; // {{SQL CARBON EDIT}} import { ShowRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction, InstallRecommendedExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions'; -import { ShowRecommendedExtensionsByScenarioAction, InstallRecommendedExtensionsByScenarioAction } from 'sql/workbench/contrib/extensions/common/extensionsActions'; +import { ShowRecommendedExtensionsByScenarioAction, InstallRecommendedExtensionsByScenarioAction } from 'sql/workbench/contrib/extensions/browser/extensionsActions'; import * as Constants from 'sql/workbench/contrib/extensions/common/constants'; // {{SQL CARBON EDIT}} - End import Severity from 'vs/base/common/severity'; diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index 2d095ef01b..01af47686b 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -28,7 +28,7 @@ import { IEditorGroupView, IEditorOpeningEvent, EditorServiceImpl } from 'vs/wor import { ILabelService } from 'vs/platform/label/common/label'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { withNullAsUndefined } from 'vs/base/common/types'; -import { convertEditorInput, getFileMode } from 'sql/workbench/common/customInputConverter'; //{{SQL CARBON EDIT}} +import { convertEditorInput, getFileMode } from 'sql/workbench/browser/customInputConverter'; //{{SQL CARBON EDIT}} type CachedEditorInput = ResourceEditorInput | IFileEditorInput | DataUriEditorInput; type OpenInEditorGroup = IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE; diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts index f91bca3633..9ee1e4942d 100644 --- a/src/vs/workbench/workbench.desktop.main.ts +++ b/src/vs/workbench/workbench.desktop.main.ts @@ -87,7 +87,7 @@ registerSingleton(IMenubarService, MenubarService); // {{SQL CARBON EDIT}} - SQL-specific services import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/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'; @@ -101,7 +101,7 @@ import { CapabilitiesService } from 'sql/platform/capabilities/common/capabiliti import { ICredentialsService as sqlICredentialsService, CredentialsService } from 'sql/platform/credentials/common/credentialsService'; import { ISerializationService, SerializationService } from 'sql/platform/serialization/common/serializationService'; import { IMetadataService, MetadataService } from 'sql/platform/metadata/common/metadataService'; -import { IObjectExplorerService, ObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { IObjectExplorerService, ObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { ITaskService, TaskService } from 'sql/platform/tasks/common/tasksService'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { QueryModelService } from 'sql/platform/query/common/queryModelService'; @@ -118,7 +118,7 @@ import { BackupService } from 'sql/platform/backup/common/backupServiceImp'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; import { BackupUiService } from 'sql/workbench/services/backup/browser/backupUiService'; import { IRestoreDialogController, IRestoreService } from 'sql/platform/restore/common/restoreService'; -import { RestoreService, RestoreDialogController } from 'sql/platform/restore/common/restoreServiceImpl'; +import { RestoreService, RestoreDialogController } from 'sql/platform/restore/browser/restoreServiceImpl'; import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; import { NewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialogService'; import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; @@ -129,7 +129,7 @@ import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/ import { InsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogServiceImpl'; import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces'; import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; -import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { ProfilerService } from 'sql/workbench/services/profiler/browser/profilerService'; import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService'; import { SqlOAuthService } from 'sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl'; @@ -139,15 +139,15 @@ import { AccountPickerService } from 'sql/platform/accounts/browser/accountPicke import { IAccountPickerService } from 'sql/platform/accounts/browser/accountPicker'; import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { ResourceProviderService } from 'sql/workbench/services/resourceProvider/browser/resourceProviderService'; -import { IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; -import { DashboardViewService } from 'sql/platform/dashboard/common/dashboardViewServiceImpl'; -import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; -import { ModelViewService } from 'sql/platform/modelComponents/common/modelViewServiceImpl'; +import { IDashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewService'; +import { DashboardViewService } from 'sql/platform/dashboard/browser/dashboardViewServiceImpl'; +import { IModelViewService } from 'sql/platform/modelComponents/browser/modelViewService'; +import { ModelViewService } from 'sql/platform/modelComponents/browser/modelViewServiceImpl'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { DashboardService } from 'sql/platform/dashboard/browser/dashboardServiceImpl'; -import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; -import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; -import { OEShimService, IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; +import { NotebookService } from 'sql/workbench/services/notebook/browser/notebookServiceImpl'; +import { INotebookService } from 'sql/workbench/services/notebook/browser/notebookService'; +import { OEShimService, IOEShimService } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerViewTreeShim'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { AdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService'; @@ -261,7 +261,7 @@ import 'sql/workbench/update/electron-browser/releaseNotes.contribution'; // data explorer import 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution'; -import 'sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution'; +import 'sql/workbench/parts/dataExplorer/browser/nodeActions.common.contribution'; import 'sql/workbench/parts/telemetry/common/telemetry.contribution'; import 'sql/workbench/parts/connection/browser/connection.contribution'; @@ -289,7 +289,7 @@ import 'sql/workbench/parts/accounts/browser/accounts.contribution'; import 'sql/workbench/parts/backup/browser/backup.contribution'; //extensions -import 'sql/workbench/parts/dataExplorer/common/extensions.contribution'; +import 'sql/workbench/parts/dataExplorer/browser/extensions.contribution'; //restore import 'sql/workbench/parts/restore/browser/restore.contribution'; @@ -318,7 +318,7 @@ import 'sql/workbench/parts/dashboard/browser/widgets/tasks/tasksWidget.contribu import 'sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.contribution'; import 'sql/workbench/parts/dashboard/browser/dashboard.contribution'; /* Tasks */ -import 'sql/workbench/common/actions.contribution'; +import 'sql/workbench/browser/actions.contribution'; /* Model-based Views */ import 'sql/workbench/browser/modelComponents/components.contribution'; /* View Model Editor */ @@ -337,4 +337,3 @@ import 'sql/workbench/parts/dashboard/browser/containers/dashboardModelViewConta import 'sql/workbench/parts/dashboard/browser/core/dashboardTab.contribution'; import 'sql/workbench/parts/commandLine/electron-browser/commandLine.contribution'; -