Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

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

@@ -4,9 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as azdata from 'azdata';
-import * as platform from 'vs/platform/registry/common/platform';
-import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar';
 
 import { Event, Emitter } from 'vs/base/common/event';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
@@ -17,7 +14,6 @@ import { Memento } from 'vs/workbench/common/memento';
 import AccountStore from 'sql/platform/accounts/common/accountStore';
 import { AccountDialogController } from 'sql/platform/accounts/browser/accountDialogController';
 import { AutoOAuthDialogController } from 'sql/platform/accounts/browser/autoOAuthDialogController';
-import { AccountListStatusbarItem } from 'sql/platform/accounts/browser/accountListStatusbarItem';
 import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces';
 import { Deferred } from 'sql/base/common/promise';
@@ -65,14 +61,6 @@ export class AccountManagementService implements IAccountManagementService {
 		this._updateAccountListEmitter = new Emitter<UpdateAccountListEventParams>();
 
 		_storageService.onWillSaveState(() => this.shutdown());
-
-		// Register status bar item
-		let statusbarDescriptor = new statusbar.StatusbarItemDescriptor(
-			AccountListStatusbarItem,
-			StatusbarAlignment.LEFT,
-			15000 /* Highest Priority */
-		);
-		(<statusbar.IStatusbarRegistry>platform.Registry.as(statusbar.Extensions.Statusbar)).registerStatusbarItem(statusbarDescriptor);
 	}
 
 	private get autoOAuthDialogController(): AutoOAuthDialogController {

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,
-		@IStatusbarService private _statusBarService: IStatusbarService,
+		@INotificationService private _notificationService: INotificationService,
 		@ILogService private logService: ILogService
 	) {
 		if (ipc) {
@@ -92,8 +92,8 @@ export class CommandLineService implements ICommandLineProcessing {
 		}
 		let connectedContext: azdata.ConnectedContext = undefined;
 		if (profile) {
-			if (this._statusBarService) {
-				this._statusBarService.setStatusMessage(localize('connectingLabel', 'Connecting:') + profile.serverName, 2500);
+			if (this._notificationService) {
+				this._notificationService.status(localize('connectingLabel', 'Connecting: {0}', profile.serverName), { hideAfter: 2500 });
 			}
 			try {
 				await this._connectionManagementService.connectIfNotConnected(profile, 'connection', true);
@@ -106,8 +106,8 @@ export class CommandLineService implements ICommandLineProcessing {
 			}
 		}
 		if (commandName) {
-			if (this._statusBarService) {
-				this._statusBarService.setStatusMessage(localize('runningCommandLabel', 'Running command:') + commandName, 2500);
+			if (this._notificationService) {
+				this._notificationService.status(localize('runningCommandLabel', 'Running command: {0}', commandName), { hideAfter: 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._statusBarService) {
-					this._statusBarService.setStatusMessage(localize('openingNewQueryLabel', 'Opening new query:') + profile.serverName, 2500);
+				if (this._notificationService) {
+					this._notificationService.status(localize('openingNewQueryLabel', 'Opening new query: {0}', profile.serverName), { hideAfter: 2500 });
 				}
 				try {
 					await TaskUtilities.newQuery(profile,
@@ -150,8 +150,8 @@ export class CommandLineService implements ICommandLineProcessing {
 					showConnectionDialogOnError: warnOnConnectFailure,
 					showFirewallRuleOnError: warnOnConnectFailure
 				};
-				if (this._statusBarService) {
-					this._statusBarService.setStatusMessage(localize('connectingQueryLabel', 'Connecting query file'), 2500);
+				if (this._notificationService) {
+					this._notificationService.status(localize('connectingQueryLabel', 'Connecting query file'), { hideAfter: 2500 });
 				}
 				await this._connectionManagementService.connect(profile, uriString, options);
 			}

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

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

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

@@ -140,9 +140,9 @@ export class ConnectionWidget {
 		});
 	}
 
-	protected _handleClipboard(): void {
+	protected async _handleClipboard(): Promise<void> {
 		if (this._configurationService.getValue<boolean>('connection.parseClipboardForConnectionString')) {
-			let paste = this._clipboardService.readText();
+			let paste = await this._clipboardService.readText();
 			this._connectionManagementService.buildConnectionInfo(paste, this._providerName).then(e => {
 				if (e) {
 					let profile = new ConnectionProfile(this._capabilitiesService, this._providerName);

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

@@ -24,7 +24,16 @@ import { IConfigurationResolverService } from 'vs/workbench/services/configurati
 import { IFileService } from 'vs/platform/files/common/files';
 
 class TestEnvironmentService implements IWorkbenchEnvironmentService {
-	machineSettingsHome: string;
+	webviewCspSource: string;
+	webviewCspRule: string;
+	localeResource: URI;
+	userRoamingDataHome: URI;
+	webviewEndpoint?: string;
+	webviewResourceRoot: string;
+	keyboardLayoutResource: URI;
+	machineSettingsResource: URI;
+	keybindingsResource: URI;
+	machineSettingsHome: URI;
 	machineSettingsPath: string;
 	extensionDevelopmentLocationURI?: URI[];
 
@@ -47,14 +56,15 @@ class TestEnvironmentService implements IWorkbenchEnvironmentService {
 	userDataPath: string;
 	appNameLong: string;
 	appQuality?: string;
-	appSettingsHome: string;
-	appSettingsPath: string;
+	appSettingsHome: URI;
+
+	settingsResource: URI;
 	appKeybindingsPath: string;
 	settingsSearchBuildId?: number;
 	settingsSearchUrl?: string;
 	globalStorageHome: string;
 	workspaceStorageHome: string;
-	backupHome: string;
+	backupHome: URI;
 	backupWorkspacesPath: string;
 	untitledWorkspacesHome: URI;
 	isExtensionDevelopment: boolean;