Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.

src/sql/azdata.proposed.d.ts

@@ -4488,8 +4488,8 @@ declare module 'azdata' {
 		* }
 		* ```
 		 * @export
-		 * @param notebook provider
-		 * @returns disposable
+		 * @param {NotebookProvider} provider
+		 * @returns {vscode.Disposable}
 		 */
 		export function registerNotebookProvider(provider: NotebookProvider): vscode.Disposable;
 

src/sql/base/browser/ui/button/button.ts

@@ -18,7 +18,7 @@ export class Button extends vsButton {
 		super(container, options);
 
 		this._register(DOM.addDisposableListener(this.element, DOM.EventType.FOCUS, () => {
-			this.element.style.outlineColor = this.buttonFocusOutline ? this.buttonFocusOutline.toString() : '';
+			this.element.style.outlineColor = this.buttonFocusOutline ? this.buttonFocusOutline.toString() : null;
 			this.element.style.outlineWidth = '1px';
 		}));
 

src/sql/base/browser/ui/dropdownList/dropdownList.ts

@@ -41,11 +41,11 @@ export class DropdownList extends Dropdown {
 		if (action) {
 			this.button = new Button(_contentContainer);
 			this.button.label = action.label;
-			this._register(DOM.addDisposableListener(this.button.element, DOM.EventType.CLICK, () => {
+			this.toDispose.push(DOM.addDisposableListener(this.button.element, DOM.EventType.CLICK, () => {
 				action.run();
 				this.hide();
 			}));
-			this._register(DOM.addDisposableListener(this.button.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
+			this.toDispose.push(DOM.addDisposableListener(this.button.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
 				let event = new StandardKeyboardEvent(e);
 				if (event.equals(KeyCode.Enter)) {
 					e.stopPropagation();
@@ -75,7 +75,7 @@ export class DropdownList extends Dropdown {
 			}
 		}));
 
-		this._register(this._list.onSelectionChange(() => {
+		this.toDispose.push(this._list.onSelectionChange(() => {
 			// focus on the dropdown label then hide the dropdown list
 			this.element.focus();
 			this.hide();

src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts

@@ -241,7 +241,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
 				}
 				this.onRemoveItems(new ArrayIterator([item.view.id!]));
 			});
-			const disposable = combinedDisposable(onChangeDisposable, containerDisposable);
+			const disposable = combinedDisposable([onChangeDisposable, containerDisposable]);
 
 			const onAdd = view.onAdd ? () => view.onAdd!() : () => { };
 			const onRemove = view.onRemove ? () => view.onRemove!() : () => { };
@@ -292,7 +292,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
 				const onEndDisposable = onEnd(this.onSashEnd, this);
 				const onDidResetDisposable = sash.onDidReset(() => this._onDidSashReset.fire(firstIndex(this.sashItems, item => item.sash === sash)));
 
-				const disposable = combinedDisposable(onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash);
+				const disposable = combinedDisposable([onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash]);
 				const sashItem: ISashItem = { sash, disposable };
 
 				this.sashItems.splice(currentIndex - 1, 0, sashItem);
@@ -344,7 +344,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
 			}
 			this.onRemoveItems(new ArrayIterator([item.view.id!]));
 		});
-		const disposable = combinedDisposable(onChangeDisposable, containerDisposable);
+		const disposable = combinedDisposable([onChangeDisposable, containerDisposable]);
 
 		const onAdd = view.onAdd ? () => view.onAdd!() : () => { };
 		const onRemove = view.onRemove ? () => view.onRemove!() : () => { };
@@ -395,7 +395,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
 			const onEndDisposable = onEnd(this.onSashEnd, this);
 			const onDidResetDisposable = sash.onDidReset(() => this._onDidSashReset.fire(firstIndex(this.sashItems, item => item.sash === sash)));
 
-			const disposable = combinedDisposable(onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash);
+			const disposable = combinedDisposable([onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash]);
 			const sashItem: ISashItem = { sash, disposable };
 
 			this.sashItems.splice(index - 1, 0, sashItem);
@@ -527,10 +527,10 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
 		const index = firstIndex(this.sashItems, item => item.sash === sash);
 
 		// This way, we can press Alt while we resize a sash, macOS style!
-		const disposable = combinedDisposable(
+		const disposable = combinedDisposable([
 			domEvent(document.body, 'keydown')(e => resetSashDragState(this.sashDragState.current, e.altKey)),
 			domEvent(document.body, 'keyup')(() => resetSashDragState(this.sashDragState.current, false))
-		);
+		]);
 
 		const resetSashDragState = (start: number, alt: boolean) => {
 			const sizes = this.viewItems.map(i => i.size);

src/sql/base/browser/ui/table/plugins/autoSizeColumns.plugin.ts

@@ -14,7 +14,7 @@ const defaultOptions: IAutoColumnSizeOptions = {
 	autoSizeOnRender: false
 };
 
-export class AutoColumnSize<T extends Object> implements Slick.Plugin<T> {
+export class AutoColumnSize<T> implements Slick.Plugin<T> {
 	private _grid: Slick.Grid<T>;
 	private _$container: JQuery;
 	private _context: CanvasRenderingContext2D;

src/sql/base/browser/ui/taskbar/actionbar.ts

@@ -43,12 +43,13 @@ export class ActionBar extends ActionRunner implements IActionRunner {
 		super();
 		this._options = options;
 		this._context = options.context;
+		this._toDispose = [];
 
 		if (this._options.actionRunner) {
 			this._actionRunner = this._options.actionRunner;
 		} else {
 			this._actionRunner = new ActionRunner();
-			this._register(this._actionRunner);
+			this._toDispose.push(this._actionRunner);
 		}
 
 		//this._toDispose.push(this.addEmitter(this._actionRunner));
@@ -364,6 +365,8 @@ export class ActionBar extends ActionRunner implements IActionRunner {
 		lifecycle.dispose(this._items);
 		this._items = [];
 
+		this._toDispose = lifecycle.dispose(this._toDispose);
+
 		this._domNode.remove();
 
 		super.dispose();

src/sql/platform/accounts/browser/accountDialog.ts

@@ -53,7 +53,7 @@ class AccountPanel extends ViewletPanel {
 
 	protected renderBody(container: HTMLElement): void {
 		this.accountList = new List<azdata.Account>(container, new AccountListDelegate(AccountDialog.ACCOUNTLIST_HEIGHT), [this.instantiationService.createInstance(AccountListRenderer)]);
-		this._register(attachListStyler(this.accountList, this.themeService));
+		this.disposables.push(attachListStyler(this.accountList, this.themeService));
 	}
 
 	protected layoutBody(size: number): void {

src/sql/platform/connection/common/connectionManagementService.ts

@@ -43,6 +43,7 @@ import * as platform from 'vs/platform/registry/common/platform';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
 import { Event, Emitter } from 'vs/base/common/event';
+import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -50,7 +51,6 @@ import { ILogService } from 'vs/platform/log/common/log';
 import * as interfaces from './interfaces';
 import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
 import { Memento } from 'vs/workbench/common/memento';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class ConnectionManagementService extends Disposable implements IConnectionManagementService {
 
@@ -70,7 +70,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 	private _onConnectRequestSent = new Emitter<void>();
 	private _onConnectionChanged = new Emitter<IConnectionParams>();
 	private _onLanguageFlavorChanged = new Emitter<azdata.DidChangeLanguageFlavorParams>();
-	private _connectionGlobalStatus = new ConnectionGlobalStatus(this._notificationService);
+	private _connectionGlobalStatus = new ConnectionGlobalStatus(this._statusBarService);
 
 	private _mementoContext: Memento;
 	private _mementoObj: any;
@@ -86,7 +86,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
 		@IConfigurationService private _configurationService: IConfigurationService,
 		@ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
 		@IQuickInputService private _quickInputService: IQuickInputService,
-		@INotificationService private _notificationService: INotificationService,
+		@IStatusbarService private _statusBarService: IStatusbarService,
 		@IResourceProviderService private _resourceProviderService: IResourceProviderService,
 		@IAngularEventingService private _angularEventing: IAngularEventingService,
 		@IAccountManagementService private _accountManagementService: IAccountManagementService,

src/sql/platform/query/common/queryModelService.ts

@@ -90,31 +90,23 @@ export class QueryModelService implements IQueryModelService {
 
 		(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
 			TimeElapsedStatusBarItem,
-			'status.timeElapsed',
-			nls.localize('status.timeElapsed', "Time Elapsed"),
 			StatusbarAlignment.RIGHT,
 			100 /* Should appear to the right of the SQL editor status */
 		));
 
 		(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
 			RowCountStatusBarItem,
-			'status.rowCount',
-			nls.localize('status.rowCount', "Row Count"),
 			StatusbarAlignment.RIGHT,
 			100 /* Should appear to the right of the SQL editor status */
 		));
 
 		(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
 			QueryStatusbarItem,
-			'status.query',
-			nls.localize('status.query', "Query"),
 			StatusbarAlignment.RIGHT,
 			100 /* High Priority */
 		));
 		(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
 			SqlFlavorStatusbarItem,
-			'status.sqlFlavor',
-			nls.localize('status.sqlFlavor', "SQL Flavor"),
 			StatusbarAlignment.RIGHT,
 			90 /* Should appear to the right of the SQL editor status */
 		));

src/sql/workbench/api/browser/extensionHost.contribution.common.ts

@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import './mainThreadAccountManagement';
-import './mainThreadBackgroundTaskManagement';
-import './mainThreadConnectionManagement';
-import './mainThreadCredentialManagement';
-import './mainThreadDashboard';
-import './mainThreadDashboardWebview';
-import './mainThreadDataProtocol';
-import './mainThreadExtensionManagement';
-import './mainThreadModalDialog';
-import './mainThreadModelView';
-import './mainThreadModelViewDialog';
-import './mainThreadNotebook';
-import './mainThreadNotebookDocumentsAndEditors';
-import './mainThreadObjectExplorer';
-import './mainThreadQueryEditor';
-import './mainThreadResourceProvider';
-import './mainThreadSerializationProvider';
-import './mainThreadTasks';

src/sql/workbench/api/electron-browser/sqlExtensionHost.contribution.ts

@@ -3,4 +3,4 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import '../browser/extensionHost.contribution.common';
+import 'sql/workbench/api/electron-browser/mainThreadModalDialog';

src/sql/workbench/api/node/sqlExtHost.api.impl.ts

@@ -40,7 +40,8 @@ import { ExtHostWorkspace } from 'vs/workbench/api/common/extHostWorkspace';
 import { ExtHostConfiguration, ExtHostConfigProvider } from 'vs/workbench/api/common/extHostConfiguration';
 import { ExtHostStorage } from 'vs/workbench/api/common/extHostStorage';
 import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import { IURITransformer } from 'vs/base/common/uriIpc';
+import { ISchemeTransformer } from 'vs/workbench/api/common/extHostLanguageFeatures';
+import { AzureResource } from 'sql/platform/accounts/common/interfaces';
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 
 export interface ISqlExtensionApiFactory {
@@ -60,9 +61,10 @@ export function createApiFactory(
 	extensionService: ExtHostExtensionService,
 	logService: ExtHostLogService,
 	extHostStorage: ExtHostStorage,
-	uriTransformer: IURITransformer | null
+	schemeTransformer: ISchemeTransformer | null,
+	outputChannelName: string
 ): ISqlExtensionApiFactory {
-	let vsCodeFactory = extHostApi.createApiFactory(initData, rpcProtocol, extHostWorkspace, extHostConfiguration, extensionService, logService, extHostStorage, uriTransformer);
+	let vsCodeFactory = extHostApi.createApiFactory(initData, rpcProtocol, extHostWorkspace, extHostConfiguration, extensionService, logService, extHostStorage, schemeTransformer, outputChannelName);
 
 	// Addressable instances
 	const extHostAccountManagement = rpcProtocol.set(SqlExtHostContext.ExtHostAccountManagement, new ExtHostAccountManagement(rpcProtocol));

src/sql/workbench/api/node/sqlExtHost.contribution.ts

@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IWorkbenchContribution, IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
+import { Registry } from 'vs/platform/registry/common/platform';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
+// --- SQL contributions
+import 'sql/workbench/api/node/mainThreadConnectionManagement';
+import 'sql/workbench/api/node/mainThreadCredentialManagement';
+import 'sql/workbench/api/node/mainThreadDataProtocol';
+import 'sql/workbench/api/node/mainThreadObjectExplorer';
+import 'sql/workbench/api/node/mainThreadBackgroundTaskManagement';
+import 'sql/workbench/api/node/mainThreadSerializationProvider';
+import 'sql/workbench/api/node/mainThreadResourceProvider';
+import 'sql/workbench/api/electron-browser/mainThreadTasks';
+import 'sql/workbench/api/electron-browser/mainThreadDashboard';
+import 'sql/workbench/api/node/mainThreadDashboardWebview';
+import 'sql/workbench/api/node/mainThreadQueryEditor';
+import 'sql/workbench/api/node/mainThreadModelView';
+import 'sql/workbench/api/node/mainThreadModelViewDialog';
+import 'sql/workbench/api/node/mainThreadNotebook';
+import 'sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors';
+import 'sql/workbench/api/node/mainThreadAccountManagement';
+import 'sql/workbench/api/node/mainThreadExtensionManagement';
+import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
+
+export class SqlExtHostContribution implements IWorkbenchContribution {
+
+	constructor(
+		@IInstantiationService private instantiationService: IInstantiationService
+	) {
+	}
+
+	public getId(): string {
+		return 'sql.api.sqlExtHost';
+	}
+}
+
+// Register File Tracker
+Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(
+	SqlExtHostContribution,
+	LifecyclePhase.Restored
+);

src/sql/workbench/browser/parts/views/customView.ts

@@ -14,7 +14,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { TreeItemCollapsibleState, ITreeViewDataProvider, TreeViewItemHandleArg, ViewContainer, ITreeItemLabel } from 'vs/workbench/common/views';
 import { FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IProgressService } from 'vs/platform/progress/common/progress';
+import { IProgressService2 } from 'vs/platform/progress/common/progress';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -160,7 +160,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
 		@IInstantiationService private instantiationService: IInstantiationService,
 		@ICommandService private commandService: ICommandService,
 		@IConfigurationService private configurationService: IConfigurationService,
-		@IProgressService private progressService: IProgressService
+		@IProgressService2 private progressService: IProgressService2
 	) {
 		super();
 		this.root = new Root();
@@ -516,7 +516,7 @@ class TreeDataSource implements IDataSource {
 		private treeView: ITreeView,
 		private container: ViewContainer,
 		private id: string,
-		@IProgressService private progressService: IProgressService,
+		@IProgressService2 private progressService: IProgressService2,
 		@IOEShimService private objectExplorerService: IOEShimService
 	) {
 	}

src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts

@@ -18,7 +18,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
 import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase';
 import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { SimpleLocalProgressService } from 'vs/editor/standalone/browser/simpleServices';
+import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';
 import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
@@ -70,7 +70,7 @@ export default class DiffEditorComponent extends ComponentBase implements ICompo
 	}
 
 	private _createEditor(): void {
-		this._instantiationService = this._instantiationService.createChild(new ServiceCollection([IProgressService, new SimpleLocalProgressService()]));
+		this._instantiationService = this._instantiationService.createChild(new ServiceCollection([IProgressService, new SimpleProgressService()]));
 		this._editor = this._instantiationService.createInstance(TextDiffEditor);
 		this._editor.reverseColoring();
 		this._editor.create(this._el.nativeElement);

src/sql/workbench/electron-browser/modelComponents/editor.component.ts

@@ -21,7 +21,7 @@ import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/co
 import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
 import { QueryTextEditor } from 'sql/workbench/electron-browser/modelComponents/queryTextEditor';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { SimpleLocalProgressService } from 'vs/editor/standalone/browser/simpleServices';
+import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 
 @Component({
@@ -59,7 +59,7 @@ export default class EditorComponent extends ComponentBase implements IComponent
 	}
 
 	private _createEditor(): void {
-		let instantiationService = this._instantiationService.createChild(new ServiceCollection([IProgressService, new SimpleLocalProgressService()]));
+		let instantiationService = this._instantiationService.createChild(new ServiceCollection([IProgressService, new SimpleProgressService()]));
 		this._editor = instantiationService.createInstance(QueryTextEditor);
 		this._editor.create(this._el.nativeElement);
 		this._editor.setVisible(true);

src/sql/workbench/parts/connection/browser/connection.contribution.ts

@@ -19,8 +19,6 @@ import { ConnectionStatusbarItem } from 'sql/workbench/parts/connection/browser/
 // Register Statusbar item
 (<statusbar.IStatusbarRegistry>Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(new statusbar.StatusbarItemDescriptor(
 	ConnectionStatusbarItem,
-	'status.connection',
-	localize('status.connection', "Connection"),
 	StatusbarAlignment.RIGHT,
 	100 /* High Priority */
 ));

src/sql/workbench/parts/connection/browser/connectionStatus.ts

@@ -40,7 +40,7 @@ export class ConnectionStatusbarItem implements IStatusbarItem {
 			this._objectExplorerService.onSelectionOrFocusChange(() => this._updateStatus())
 		);
 
-		return combinedDisposable(...this._toDispose);
+		return combinedDisposable(this._toDispose);
 	}
 
 	// Update the connection status shown in the bar

src/sql/workbench/parts/connection/common/connectionGlobalStatus.ts

@@ -3,8 +3,8 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import { ConnectionSummary } from 'azdata';
+import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 
 // Status when making connections from the viewlet
 export class ConnectionGlobalStatus {
@@ -12,12 +12,12 @@ export class ConnectionGlobalStatus {
 	private _displayTime: number = 5000; // (in ms)
 
 	constructor(
-		@INotificationService private _notificationService: INotificationService
+		@IStatusbarService private _statusBarService: IStatusbarService
 	) {
 	}
 
 	public setStatusToConnected(connectionSummary: ConnectionSummary): void {
-		if (this._notificationService) {
+		if (this._statusBarService) {
 			let text: string;
 			let connInfo: string = connectionSummary.serverName;
 			if (connInfo) {
@@ -28,13 +28,13 @@ export class ConnectionGlobalStatus {
 				}
 				text = LocalizedConstants.onDidConnectMessage + ' ' + connInfo;
 			}
-			this._notificationService.status(text, { hideAfter: this._displayTime });
+			this._statusBarService.setStatusMessage(text, this._displayTime);
 		}
 	}
 
 	public setStatusToDisconnected(fileUri: string): void {
-		if (this._notificationService) {
-			this._notificationService.status(LocalizedConstants.onDidDisconnectMessage, { hideAfter: this._displayTime });
+		if (this._statusBarService) {
+			this._statusBarService.setStatusMessage(LocalizedConstants.onDidDisconnectMessage, this._displayTime);
 		}
 	}
 }

src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts

@@ -32,7 +32,7 @@ import { generateUuid } from 'vs/base/common/uuid';
 import { $ } from 'vs/base/browser/dom';
 import { ExecuteCommandAction } from 'vs/platform/actions/common/actions';
 import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
-import { ILocalProgressService } from 'vs/platform/progress/common/progress';
+import { IProgressService } from 'vs/platform/progress/common/progress';
 
 export class ObjectMetadataWrapper implements ObjectMetadata {
 	public metadataType: MetadataType;
@@ -111,7 +111,7 @@ export class ExplorerController extends TreeDefaults.DefaultController {
 		private _contextMenuService: IContextMenuService,
 		private _capabilitiesService: ICapabilitiesService,
 		private _instantiationService: IInstantiationService,
-		private _progressService: ILocalProgressService
+		private _progressService: IProgressService
 	) {
 		super();
 	}
@@ -424,7 +424,7 @@ class ExplorerScriptSelectAction extends ScriptSelectAction {
 		@IQueryEditorService queryEditorService: IQueryEditorService,
 		@IConnectionManagementService connectionManagementService: IConnectionManagementService,
 		@IScriptingService scriptingService: IScriptingService,
-		@ILocalProgressService private progressService: ILocalProgressService
+		@IProgressService private progressService: IProgressService
 	) {
 		super(id, label, queryEditorService, connectionManagementService, scriptingService);
 	}
@@ -443,7 +443,7 @@ class ExplorerScriptCreateAction extends ScriptCreateAction {
 		@IConnectionManagementService connectionManagementService: IConnectionManagementService,
 		@IScriptingService scriptingService: IScriptingService,
 		@IErrorMessageService errorMessageService: IErrorMessageService,
-		@ILocalProgressService private progressService: ILocalProgressService
+		@IProgressService private progressService: IProgressService
 	) {
 		super(id, label, queryEditorService, connectionManagementService, scriptingService, errorMessageService);
 	}
@@ -462,7 +462,7 @@ class ExplorerScriptAlterAction extends ScriptAlterAction {
 		@IConnectionManagementService connectionManagementService: IConnectionManagementService,
 		@IScriptingService scriptingService: IScriptingService,
 		@IErrorMessageService errorMessageService: IErrorMessageService,
-		@ILocalProgressService private progressService: ILocalProgressService
+		@IProgressService private progressService: IProgressService
 	) {
 		super(id, label, queryEditorService, connectionManagementService, scriptingService, errorMessageService);
 	}
@@ -481,7 +481,7 @@ class ExplorerScriptExecuteAction extends ScriptExecuteAction {
 		@IConnectionManagementService connectionManagementService: IConnectionManagementService,
 		@IScriptingService scriptingService: IScriptingService,
 		@IErrorMessageService errorMessageService: IErrorMessageService,
-		@ILocalProgressService private progressService: ILocalProgressService
+		@IProgressService private progressService: IProgressService
 	) {
 		super(id, label, queryEditorService, connectionManagementService, scriptingService, errorMessageService);
 	}
@@ -498,7 +498,7 @@ class ExplorerManageAction extends ManageAction {
 		id: string, label: string,
 		@IConnectionManagementService connectionManagementService: IConnectionManagementService,
 		@IAngularEventingService angularEventingService: IAngularEventingService,
-		@ILocalProgressService private _progressService: ILocalProgressService
+		@IProgressService private _progressService: IProgressService
 	) {
 		super(id, label, connectionManagementService, angularEventingService);
 	}

src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts

@@ -7,7 +7,7 @@ import 'vs/css!sql/media/objectTypes/objecttypes';
 import 'vs/css!sql/media/icons/common-icons';
 import 'vs/css!./media/explorerWidget';
 
-import { Component, Inject, forwardRef, OnInit, ViewChild, ElementRef } from '@angular/core';
+import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ViewChild, ElementRef } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget';
@@ -26,7 +26,7 @@ import { Delayer } from 'vs/base/common/async';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ILocalProgressService } from 'vs/platform/progress/common/progress';
+import { IProgressService } from 'vs/platform/progress/common/progress';
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 
 @Component({
@@ -58,6 +58,7 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
 	constructor(
 		@Inject(forwardRef(() => CommonServiceInterface)) private _bootstrap: CommonServiceInterface,
 		@Inject(forwardRef(() => Router)) private _router: Router,
+		@Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef,
 		@Inject(WIDGET_CONFIG) protected _config: WidgetConfig,
 		@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
 		@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
@@ -65,7 +66,7 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget,
 		@Inject(IInstantiationService) private instantiationService: IInstantiationService,
 		@Inject(IContextMenuService) private contextMenuService: IContextMenuService,
 		@Inject(ICapabilitiesService) private capabilitiesService: ICapabilitiesService,
-		@Inject(ILocalProgressService) private progressService: ILocalProgressService
+		@Inject(IProgressService) private progressService: IProgressService
 	) {
 		super();
 		this.init();

src/sql/workbench/parts/dataExplorer/browser/connectionViewletPanel.ts

@@ -128,6 +128,7 @@ export class ConnectionViewletPanel extends ViewletPanel {
 	}
 
 	dispose(): void {
+		this.disposables = dispose(this.disposables);
 		super.dispose();
 	}
 

src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts

@@ -12,7 +12,7 @@ import { ICustomViewDescriptor, TreeViewItemHandleArg } from 'sql/workbench/comm
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { IViewsRegistry, Extensions } from 'vs/workbench/common/views';
-import { IProgressService } from 'vs/platform/progress/common/progress';
+import { IProgressService2 } from 'vs/platform/progress/common/progress';
 import { Registry } from 'vs/platform/registry/common/platform';
 
 export const DISCONNECT_COMMAND_ID = 'dataExplorer.disconnect';
@@ -82,7 +82,7 @@ CommandsRegistry.registerCommand({
 CommandsRegistry.registerCommand({
 	id: REFRESH_COMMAND_ID,
 	handler: (accessor, args: TreeViewItemHandleArg) => {
-		const progressSerivce = accessor.get(IProgressService);
+		const progressSerivce = accessor.get(IProgressService2);
 		if (args.$treeItem) {
 			const { treeView } = (<ICustomViewDescriptor>Registry.as<IViewsRegistry>(Extensions.ViewsRegistry).getView(args.$treeViewId));
 			if (args.$treeContainerId) {

src/sql/workbench/parts/editData/common/editDataInput.ts

@@ -56,11 +56,12 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 		this._setup = false;
 		this._stopButtonEnabled = false;
 		this._refreshButtonEnabled = false;
+		this._toDispose = [];
 		this._useQueryFilter = false;
 
 		// re-emit sql editor events through this editor if it exists
 		if (this._sql) {
-			this._register(this._sql.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
+			this._toDispose.push(this._sql.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
 			this._sql.disableSaving();
 		}
 		this.disableSaving();
@@ -73,7 +74,7 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 			let self = this;
 
 			// Register callbacks for the Actions
-			this._register(
+			this._toDispose.push(
 				this._queryModelService.onRunQueryStart(uri => {
 					if (self.uri === uri) {
 						self.initEditStart();
@@ -81,7 +82,7 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 				})
 			);
 
-			this._register(
+			this._toDispose.push(
 				this._queryModelService.onEditSessionReady((result) => {
 					if (self.uri === result.ownerUri) {
 						self.initEditEnd(result);
@@ -209,6 +210,7 @@ export class EditDataInput extends EditorInput implements IConnectableInput {
 		this._queryModelService.disposeQuery(this.uri);
 		this._sql.dispose();
 		this._results.dispose();
+		this._toDispose = dispose(this._toDispose);
 
 		super.dispose();
 	}

src/sql/workbench/parts/notebook/cellViews/code.component.ts

@@ -17,7 +17,7 @@ import { NotebookModel } from 'sql/workbench/parts/notebook/models/notebookModel
 import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import * as themeColors from 'vs/workbench/common/theme';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
-import { SimpleLocalProgressService } from 'vs/editor/standalone/browser/simpleServices';
+import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices';
 import { IProgressService } from 'vs/platform/progress/common/progress';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITextModel } from 'vs/editor/common/model';
@@ -189,7 +189,7 @@ export class CodeComponent extends AngularDisposable implements OnInit, OnChange
 	}
 
 	private async createEditor(): Promise<void> {
-		let instantiationService = this._instantiationService.createChild(new ServiceCollection([IProgressService, new SimpleLocalProgressService()]));
+		let instantiationService = this._instantiationService.createChild(new ServiceCollection([IProgressService, new SimpleProgressService()]));
 		this._editor = instantiationService.createInstance(QueryTextEditor);
 		this._editor.create(this.codeElement.nativeElement);
 		this._editor.setVisible(true);

src/sql/workbench/parts/notebook/notebookStyles.ts

@@ -7,8 +7,8 @@ import 'vs/css!./notebook';
 import { registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
 import { SIDE_BAR_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, EDITOR_GROUP_HEADER_TABS_BACKGROUND } from 'vs/workbench/common/theme';
 import { activeContrastBorder, contrastBorder, buttonBackground, textLinkForeground, textLinkActiveForeground, textPreformatForeground, textBlockQuoteBackground, textBlockQuoteBorder } from 'vs/platform/theme/common/colorRegistry';
+import { IDisposable } from 'vscode-xterm';
 import { editorLineHighlight, editorLineHighlightBorder } from 'vs/editor/common/view/editorColorRegistry';
-import { IDisposable } from 'vs/base/common/lifecycle';
 
 export function registerNotebookThemes(overrideEditorThemeSetting: boolean): IDisposable {
 	return registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {

src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts

@@ -8,7 +8,7 @@ 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 { IProgressService, IProgressRunner, ILocalProgressService } from 'vs/platform/progress/common/progress';
+import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress';
 import { TreeNode } from 'sql/workbench/parts/objectExplorer/common/treeNode';
 import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
 
@@ -18,7 +18,7 @@ export class TreeSelectionHandler {
 	private _clicks: number = 0;
 	private _doubleClickTimeoutTimer: NodeJS.Timer = undefined;
 
-	constructor(@ILocalProgressService private _progressService: ILocalProgressService) {
+	constructor(@IProgressService private _progressService: IProgressService) {
 
 	}
 

src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts

@@ -271,7 +271,7 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
 				: localize('ProfilerTableEditor.eventCount', 'Events: {0}', this._input.data.getLength());
 
 			this._disposeStatusbarItem();
-			this._statusbarItem = this._statusbarService.addEntry({ text: message }, 'status.eventCount', localize('status.eventCount', "Event Count"), StatusbarAlignment.RIGHT);
+			this._statusbarItem = this._statusbarService.addEntry({ text: message }, StatusbarAlignment.RIGHT);
 		}
 	}
 

src/sql/workbench/parts/query/browser/flavorStatus.ts

@@ -87,7 +87,7 @@ export class SqlFlavorStatusbarItem implements IStatusbarItem {
 			this._editorService.onDidVisibleEditorsChange(() => this._onEditorsChanged()),
 			this._editorService.onDidCloseEditor(event => this._onEditorClosed(event))
 		);
-		return combinedDisposable(...this._toDispose);
+		return combinedDisposable(this._toDispose);
 	}
 
 	private _onSelectionClick() {

src/sql/workbench/parts/query/browser/queryEditor.ts

@@ -156,7 +156,7 @@ export class QueryEditor extends BaseEditor {
 
 		this.setTaskbarContent();
 
-		this._register(this.configurationService.onDidChangeConfiguration(e => {
+		this._toDispose.push(this.configurationService.onDidChangeConfiguration(e => {
 			if (e.affectedKeys.includes('workbench.enablePreviewFeatures')) {
 				this.setTaskbarContent();
 			}

src/sql/workbench/parts/query/browser/queryStatus.ts

@@ -47,7 +47,7 @@ export class QueryStatusbarItem implements IStatusbarItem {
 			this._editorService.onDidCloseEditor(event => this._onEditorClosed(event))
 		);
 
-		return combinedDisposable(...this._toDispose);
+		return combinedDisposable(this._toDispose);
 	}
 
 	private _onEditorClosed(event: IEditorCloseEvent): void {

src/sql/workbench/parts/query/browser/rowCountStatus.ts

@@ -40,7 +40,7 @@ export class RowCountStatusBarItem implements IStatusbarItem {
 
 		this._showStatus();
 
-		return combinedDisposable(...disposables);
+		return combinedDisposable(disposables);
 	}
 
 	private _onEditorsChanged() {

src/sql/workbench/parts/query/browser/timeElapsedStatus.ts

@@ -43,7 +43,7 @@ export class TimeElapsedStatusBarItem implements IStatusbarItem {
 
 		this._showStatus();
 
-		return combinedDisposable(...disposables);
+		return combinedDisposable(disposables);
 	}
 
 	private _onEditorsChanged() {

src/sql/workbench/services/accountManagement/browser/accountManagementService.ts

@@ -69,8 +69,6 @@ export class AccountManagementService implements IAccountManagementService {
 		// Register status bar item
 		let statusbarDescriptor = new statusbar.StatusbarItemDescriptor(
 			AccountListStatusbarItem,
-			'status.accountList',
-			localize('status.accountList', "Account List"),
 			StatusbarAlignment.LEFT,
 			15000 /* Highest Priority */
 		);

src/sql/workbench/services/commandLine/common/commandLineService.ts

@@ -22,11 +22,11 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { ipcRenderer as ipc } from 'electron';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import { localize } from 'vs/nls';
 import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { URI } from 'vs/base/common/uri';
 import { ILogService } from 'vs/platform/log/common/log';
-import { INotificationService } from 'vs/platform/notification/common/notification';
 
 export class CommandLineService implements ICommandLineProcessing {
 	public _serviceBrand: any;
@@ -40,7 +40,7 @@ export class CommandLineService implements ICommandLineProcessing {
 		@IEditorService private _editorService: IEditorService,
 		@ICommandService private _commandService: ICommandService,
 		@IConfigurationService private _configurationService: IConfigurationService,
-		@INotificationService private _notificationService: INotificationService,
+		@IStatusbarService private _statusBarService: IStatusbarService,
 		@ILogService private logService: ILogService
 	) {
 		if (ipc) {
@@ -92,8 +92,8 @@ export class CommandLineService implements ICommandLineProcessing {
 		}
 		let connectedContext: azdata.ConnectedContext = undefined;
 		if (profile) {
-			if (this._notificationService) {
-				this._notificationService.status(localize('connectingLabel', 'Connecting: {0}', profile.serverName), { hideAfter: 2500 });
+			if (this._statusBarService) {
+				this._statusBarService.setStatusMessage(localize('connectingLabel', 'Connecting:') + profile.serverName, 2500);
 			}
 			try {
 				await this._connectionManagementService.connectIfNotConnected(profile, 'connection', true);
@@ -106,8 +106,8 @@ export class CommandLineService implements ICommandLineProcessing {
 			}
 		}
 		if (commandName) {
-			if (this._notificationService) {
-				this._notificationService.status(localize('runningCommandLabel', 'Running command: {0}', commandName), { hideAfter: 2500 });
+			if (this._statusBarService) {
+				this._statusBarService.setStatusMessage(localize('runningCommandLabel', 'Running command:') + commandName, 2500);
 			}
 			await this._commandService.executeCommand(commandName, connectedContext);
 		} else if (profile) {
@@ -119,8 +119,8 @@ export class CommandLineService implements ICommandLineProcessing {
 			}
 			else {
 				// Default to showing new query
-				if (this._notificationService) {
-					this._notificationService.status(localize('openingNewQueryLabel', 'Opening new query: {0}', profile.serverName), { hideAfter: 2500 });
+				if (this._statusBarService) {
+					this._statusBarService.setStatusMessage(localize('openingNewQueryLabel', 'Opening new query:') + profile.serverName, 2500);
 				}
 				try {
 					await TaskUtilities.newQuery(profile,
@@ -150,8 +150,8 @@ export class CommandLineService implements ICommandLineProcessing {
 					showConnectionDialogOnError: warnOnConnectFailure,
 					showFirewallRuleOnError: warnOnConnectFailure
 				};
-				if (this._notificationService) {
-					this._notificationService.status(localize('connectingQueryLabel', 'Connecting query file'), { hideAfter: 2500 });
+				if (this._statusBarService) {
+					this._statusBarService.setStatusMessage(localize('connectingQueryLabel', 'Connecting query file'), 2500);
 				}
 				await this._connectionManagementService.connect(profile, uriString, options);
 			}

src/sql/workbench/services/connection/browser/connectionDialogWidget.ts

@@ -451,6 +451,10 @@ export class ConnectionDialogWidget extends Modal {
 		this.onProviderTypeSelected(displayName);
 	}
 
+	public dispose(): void {
+		this._toDispose.forEach(obj => obj.dispose());
+	}
+
 	public set databaseDropdownExpanded(val: boolean) {
 		this._databaseDropdownExpanded = val;
 	}

src/sql/workbench/services/insights/test/common/insightsUtils.test.ts

@@ -45,8 +45,7 @@ class TestEnvironmentService implements IWorkbenchEnvironmentService {
 	appNameLong: string;
 	appQuality?: string;
 	appSettingsHome: string;
-
-	settingsResource: URI;
+	appSettingsPath: string;
 	appKeybindingsPath: string;
 	settingsSearchBuildId?: number;
 	settingsSearchUrl?: string;