Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

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

@@ -54,7 +54,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.accountList = new List<azdata.Account>('AccountList', container, new AccountListDelegate(AccountDialog.ACCOUNTLIST_HEIGHT), [this.instantiationService.createInstance(AccountListRenderer)]);
 		this._register(attachListStyler(this.accountList, this.themeService));
 	}
 

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

@@ -10,7 +10,7 @@ import * as azdata from 'azdata';
 
 export const IAccountPickerService = createDecorator<IAccountPickerService>('AccountPickerService');
 export interface IAccountPickerService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	renderAccountPicker(container: HTMLElement): void;
 	addAccountCompleteEvent: Event<void>;
 	addAccountErrorEvent: Event<string>;

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

@@ -87,7 +87,7 @@ export class AccountPicker extends Disposable {
 		const delegate = new AccountListDelegate(AccountPicker.ACCOUNTPICKERLIST_HEIGHT);
 		const accountRenderer = new AccountPickerListRenderer();
 		this._listContainer = DOM.$('div.account-list-container');
-		this._accountList = new List<azdata.Account>(this._listContainer, delegate, [accountRenderer]);
+		this._accountList = new List<azdata.Account>('AccountPicker', this._listContainer, delegate, [accountRenderer]);
 		this._register(attachListStyler(this._accountList, this._themeService));
 
 		this._rootElement = DOM.$('div.account-picker-container');

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

@@ -11,7 +11,7 @@ import { IAccountPickerService } from 'sql/platform/accounts/browser/accountPick
 import { AccountPicker } from 'sql/platform/accounts/browser/accountPickerImpl';
 
 export class AccountPickerService implements IAccountPickerService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _accountPicker: AccountPicker;
 

src/sql/platform/accounts/common/interfaces.ts

@@ -13,7 +13,7 @@ export const SERVICE_ID = 'accountManagementService';
 export const IAccountManagementService = createDecorator<IAccountManagementService>(SERVICE_ID);
 
 export interface IAccountManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	// ACCOUNT MANAGEMENT METHODS //////////////////////////////////////////
 	accountUpdated(account: azdata.Account): Thenable<void>;

src/sql/platform/accounts/test/common/testAccountManagementService.ts

@@ -9,7 +9,7 @@ import { IAccountManagementService } from 'sql/platform/accounts/common/interfac
 import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 
 export class TestAccountManagementService implements IAccountManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	public get addAccountProviderEvent(): Event<AccountProviderAddedEventParams> { return Event.None; }
 	public get removeAccountProviderEvent(): Event<azdata.AccountProviderMetadata> { return Event.None; }

src/sql/platform/angularEventing/common/angularEventingService.ts

@@ -29,7 +29,7 @@ export interface IAngularEvent {
 }
 
 export interface IAngularEventingService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	/**
 	 * Adds a listener for the dashboard to send events, should only be called once for each dashboard by the dashboard itself
 	 * @param uri Uri of the dashboard

src/sql/platform/angularEventing/node/angularEventingService.ts

@@ -10,7 +10,7 @@ import { IAngularEventingService, IAngularEvent, AngularEventType } from 'sql/pl
 import { ILogService } from 'vs/platform/log/common/log';
 
 export class AngularEventingService implements IAngularEventingService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 	private _angularMap = new Map<string, Subject<IAngularEvent>>();
 
 	constructor(

src/sql/platform/backup/common/backupService.ts

@@ -17,7 +17,7 @@ export const SERVICE_ID = 'backupService';
 export const IBackupService = createDecorator<IBackupService>(SERVICE_ID);
 
 export interface IBackupService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	getBackupConfigInfo(connectionUri: string): Thenable<azdata.BackupConfigInfo>;
 

src/sql/platform/backup/common/backupServiceImp.ts

@@ -14,7 +14,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 
 export class BackupService implements IBackupService {
 
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 	private _providers: { [handle: string]: azdata.BackupProvider; } = Object.create(null);
 
 	constructor(

src/sql/platform/capabilities/common/capabilitiesService.ts

@@ -30,7 +30,7 @@ export const ICapabilitiesService = createDecorator<ICapabilitiesService>(SERVIC
  * Interface for managing provider capabilities
  */
 export interface ICapabilitiesService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	/**
 	 * Retrieve a list of registered capabilities providers

src/sql/platform/capabilities/common/capabilitiesServiceImpl.ts

@@ -33,7 +33,7 @@ interface CapabilitiesMomento {
  * to discover the DMP capabilities that a DMP provider offers.
  */
 export class CapabilitiesService extends Disposable implements ICapabilitiesService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _momento: Memento;
 	private _providers = new Map<string, ProviderFeatures>();

src/sql/platform/capabilities/test/common/testCapabilitiesService.ts

@@ -14,7 +14,7 @@ import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 
 export class TestCapabilitiesService implements ICapabilitiesService {
 
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	public capabilities: { [id: string]: ProviderFeatures } = {};
 

src/sql/platform/clipboard/electron-browser/clipboardService.ts

@@ -9,7 +9,7 @@ import { BrowserClipboardService } from 'sql/platform/clipboard/browser/clipboar
 import { clipboard, nativeImage } from 'electron';
 
 export class ClipboardService extends BrowserClipboardService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	constructor(
 		@vsIClipboardService _vsClipboardService: vsIClipboardService,

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

@@ -53,7 +53,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 
 export class ConnectionManagementService extends Disposable implements IConnectionManagementService {
 
-	_serviceBrand!: ServiceIdentifier<IConnectionManagementService>;
+	_serviceBrand: undefined;
 
 	private _providers = new Map<string, { onReady: Promise<azdata.ConnectionProvider>, properties: ConnectionProviderProperties }>();
 	private _iconProviders = new Map<string, azdata.IconProvider>();

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

@@ -65,7 +65,7 @@ export const SERVICE_ID = 'connectionManagementService';
 export const IConnectionManagementService = createDecorator<IConnectionManagementService>(SERVICE_ID);
 
 export interface IConnectionManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	// Event Emitters
 	onAddConnectionProfile: Event<IConnectionProfile>;

src/sql/platform/connection/test/common/testConfigurationService.ts

@@ -6,7 +6,7 @@
 import { getConfigurationKeys, IConfigurationOverrides, IConfigurationService, getConfigurationValue, isConfigurationOverrides, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 
 export class TestConfigurationService implements IConfigurationService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	private configuration = {
 		user: {},

src/sql/platform/connection/test/common/testConnectionManagementService.ts

@@ -16,7 +16,7 @@ import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/com
 // Test stubs for commonly used objects
 
 export class TestConnectionManagementService implements IConnectionManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	onAddConnectionProfile = undefined;
 	onDeleteConnectionProfile = undefined;
 	onConnectionChanged = undefined;

src/sql/platform/credentials/common/credentialsService.ts

@@ -21,7 +21,7 @@ export interface CredentialManagementEvents {
 export const ICredentialsService = createDecorator<ICredentialsService>(SERVICE_ID);
 
 export interface ICredentialsService {
-	_serviceBrand: ServiceIdentifier<ICredentialsService>;
+	_serviceBrand: undefined;
 
 	saveCredential(credentialId: string, password: string): Promise<boolean>;
 
@@ -34,7 +34,7 @@ export interface ICredentialsService {
 
 export class CredentialsService implements ICredentialsService {
 
-	_serviceBrand: ServiceIdentifier<ICredentialsService>;
+	_serviceBrand: undefined;
 
 	private _serverEvents: { [handle: number]: CredentialManagementEvents; } = Object.create(null);
 

src/sql/platform/credentials/test/common/testCredentialsService.ts

@@ -9,7 +9,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
 import { Emitter } from 'vs/base/common/event';
 
 export class TestCredentialsService implements ICredentialsService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	public credentials = new Map<string, Credential>();
 

src/sql/platform/dashboard/browser/dashboardService.ts

@@ -12,7 +12,7 @@ export const IDashboardService = createDecorator<IDashboardService>('dashboardSe
 
 export interface IDashboardService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	readonly onDidOpenDashboard: Event<azdata.DashboardDocument>;
 	readonly onDidChangeToDashboard: Event<azdata.DashboardDocument>;
 	readonly onLayout: Event<DOM.Dimension>;

src/sql/platform/dashboard/browser/dashboardServiceImpl.ts

@@ -9,7 +9,7 @@ import * as DOM from 'vs/base/browser/dom';
 import * as azdata from 'azdata';
 
 export class DashboardService implements IDashboardService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 	private _onDidOpenDashboard = new Emitter<azdata.DashboardDocument>();
 	public readonly onDidOpenDashboard: Event<azdata.DashboardDocument> = this._onDidOpenDashboard.event;
 

src/sql/platform/dashboard/browser/dashboardViewService.ts

@@ -17,7 +17,7 @@ export interface IDashboardWebview extends IView {
 }
 
 export interface IDashboardViewService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	onRegisteredWebview: Event<IDashboardWebview>;
 	registerWebview(widget: IDashboardWebview);
 	onRegisteredModelView: Event<IModelView>;

src/sql/platform/dashboard/browser/dashboardViewServiceImpl.ts

@@ -8,7 +8,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IModelView } from 'sql/platform/model/browser/modelViewService';
 
 export class DashboardViewService implements IDashboardViewService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _onRegisteredWebview = new Emitter<IDashboardWebview>();
 	public readonly onRegisteredWebview: Event<IDashboardWebview> = this._onRegisteredWebview.event;

src/sql/platform/errorMessage/common/errorMessageService.ts

@@ -9,6 +9,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 
 export const IErrorMessageService = createDecorator<IErrorMessageService>('errorMessageService');
 export interface IErrorMessageService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	showDialog(severity: Severity, headerTitle: string, message: string, messageDetails?: string, actions?: IAction[]): void;
 }

src/sql/platform/errorMessage/test/common/testErrorMessageService.ts

@@ -7,7 +7,7 @@ import Severity from 'vs/base/common/severity';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
 
 export class TestErrorMessageService implements IErrorMessageService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	showDialog(severity: Severity, headerTitle: string, message: string): void {
 	}
-}
+}

src/sql/platform/fileBrowser/common/fileBrowserService.ts

@@ -17,7 +17,7 @@ import * as strings from 'vs/base/common/strings';
 import { invalidProvider } from 'sql/base/common/errors';
 
 export class FileBrowserService implements IFileBrowserService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 	private _providers: { [handle: string]: azdata.FileBrowserProvider; } = Object.create(null);
 	private _onAddFileTree = new Emitter<FileBrowserTree>();
 	private _onExpandFolder = new Emitter<FileNode>();

src/sql/platform/fileBrowser/common/interfaces.ts

@@ -11,7 +11,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 
 export const IFileBrowserService = createDecorator<IFileBrowserService>('fileBrowserService');
 export interface IFileBrowserService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	onAddFileTree: Event<FileBrowserTree>;
 	onExpandFolder: Event<FileNode>;
 	onPathValidate: Event<azdata.FileBrowserValidatedParams>;
@@ -55,4 +55,4 @@ export interface IFileBrowserService {
 	 * Close file browser
 	 */
 	closeFileBrowser(ownerUri: string): Thenable<azdata.FileBrowserCloseResponse>;
-}
+}

src/sql/platform/jobManagement/common/interfaces.ts

@@ -13,7 +13,7 @@ export const SERVICE_ID = 'jobManagementService';
 export const IJobManagementService = createDecorator<IJobManagementService>(SERVICE_ID);
 
 export interface IJobManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	onDidChange: Event<void>;
 
 	registerProvider(providerId: string, provider: azdata.AgentServicesProvider): void;

src/sql/platform/jobManagement/common/jobManagementService.ts

@@ -10,7 +10,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
 import { Event, Emitter } from 'vs/base/common/event';
 
 export class JobManagementService implements IJobManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _onDidChange = new Emitter<void>();
 	public readonly onDidChange: Event<void> = this._onDidChange.event;
@@ -213,7 +213,7 @@ export class JobManagementService implements IJobManagementService {
  * Server level caching of jobs/job histories and their views
  */
 export class JobCacheObject {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	private _jobs: azdata.AgentJobInfo[] = [];
 	private _jobHistories: { [jobID: string]: azdata.AgentJobHistoryInfo[]; } = {};
 	private _jobSteps: { [jobID: string]: azdata.AgentJobStepInfo[]; } = {};
@@ -399,7 +399,7 @@ export class NotebookCacheObject {
  * Server level caching of Operators
  */
 export class OperatorsCacheObject {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	private _operators: azdata.AgentOperatorInfo[];
 	private _dataView: Slick.Data.DataView<any>;
 	private _serverName: string;
@@ -436,7 +436,7 @@ export class OperatorsCacheObject {
 * Server level caching of job alerts and the alerts view
 */
 export class AlertsCacheObject {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	private _alerts: azdata.AgentAlertInfo[];
 	private _dataView: Slick.Data.DataView<any>;
 	private _serverName: string;
@@ -473,7 +473,7 @@ export class AlertsCacheObject {
  * Server level caching of job proxies and proxies view
  */
 export class ProxiesCacheObject {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	private _proxies: azdata.AgentProxyInfo[];
 	private _dataView: Slick.Data.DataView<any>;
 	private _serverName: string;

src/sql/platform/metadata/common/metadataService.ts

@@ -12,7 +12,7 @@ export const SERVICE_ID = 'metadataService';
 export const IMetadataService = createDecorator<IMetadataService>(SERVICE_ID);
 
 export interface IMetadataService {
-	_serviceBrand: ServiceIdentifier<IMetadataService>;
+	_serviceBrand: undefined;
 
 	getMetadata(connectionUri: string): Thenable<azdata.ProviderMetadata>;
 
@@ -30,7 +30,7 @@ export interface IMetadataService {
 
 export class MetadataService implements IMetadataService {
 
-	public _serviceBrand: ServiceIdentifier<IMetadataService>;
+	_serviceBrand: undefined;
 
 	private _providers: { [handle: string]: azdata.MetadataProvider; } = Object.create(null);
 

src/sql/platform/modelComponents/browser/modelViewService.ts

@@ -11,7 +11,7 @@ import { IModelView } from 'sql/platform/model/browser/modelViewService';
 export const SERVICE_ID = 'modelViewService';
 
 export interface IModelViewService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	onRegisteredModelView: Event<IModelView>;
 	registerModelView(widget: IModelView);
 }

src/sql/platform/modelComponents/browser/modelViewServiceImpl.ts

@@ -8,7 +8,7 @@ import { Event, Emitter } from 'vs/base/common/event';
 import { IModelView } from 'sql/platform/model/browser/modelViewService';
 
 export class ModelViewService implements IModelViewService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _onRegisteredModelView = new Emitter<IModelView>();
 	public readonly onRegisteredModelView: Event<IModelView> = this._onRegisteredModelView.event;

src/sql/platform/oAuth/common/sqlOAuthService.ts

@@ -13,7 +13,7 @@ export const ISqlOAuthService = createDecorator<ISqlOAuthService>('sqlOAuthServi
  * electron-based services are referenced in unit testable code.
  */
 export interface ISqlOAuthService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	/**
 	 * Sends request to main thread to handle OAuth request

src/sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl.ts

@@ -12,7 +12,7 @@ import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService';
  * electron-based services are referenced in unit testable code.
  */
 export class SqlOAuthService implements ISqlOAuthService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	/**
 	 * Sends request to main thread to handle OAuth request

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

@@ -20,7 +20,7 @@ export const SERVICE_ID = 'queryManagementService';
 export const IQueryManagementService = createDecorator<IQueryManagementService>(SERVICE_ID);
 
 export interface IQueryManagementService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	onHandlerAdded: Event<string>;
 
@@ -91,7 +91,7 @@ export interface IQueryRequestHandler {
 }
 
 export class QueryManagementService implements IQueryManagementService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 
 	private _requestHandlers = new Map<string, IQueryRequestHandler>();
 	private _onHandlerAddedEmitter = new Emitter<string>();

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

@@ -47,7 +47,7 @@ export interface IQueryEvent {
  * Interface for the logic of handling running queries and grid interactions for all URIs.
  */
 export interface IQueryModelService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	getQueryRunner(uri: string): QueryRunner;
 

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

@@ -53,7 +53,7 @@ export class QueryInfo {
  * Handles running queries and grid interactions for all URIs. Interacts with each URI's results grid via a DataService instance
  */
 export class QueryModelService implements IQueryModelService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	// MEMBER VARIABLES ////////////////////////////////////////////////////
 	private _queryInfoMap: Map<string, QueryInfo>;

src/sql/platform/restore/browser/restoreServiceImpl.ts

@@ -29,7 +29,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 
 export class RestoreService implements IRestoreService {
 
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 	private _providers: { [handle: string]: azdata.RestoreProvider; } = Object.create(null);
 
 	constructor(
@@ -132,7 +132,7 @@ export class RestoreService implements IRestoreService {
 }
 
 export class RestoreDialogController implements IRestoreDialogController {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private _restoreDialogs: { [provider: string]: RestoreDialog | OptionsDialog } = {};
 	private _currentProvider: string;

src/sql/platform/restore/common/restoreService.ts

@@ -13,7 +13,7 @@ export const SERVICE_ID = 'restoreService';
 export const IRestoreService = createDecorator<IRestoreService>(SERVICE_ID);
 
 export interface IRestoreService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	/**
 	 * Register a disaster recovery provider
@@ -43,6 +43,6 @@ export interface IRestoreService {
 
 export const IRestoreDialogController = createDecorator<IRestoreDialogController>('restoreDialogService');
 export interface IRestoreDialogController {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	showDialog(connection: IConnectionProfile): Promise<void>;
 }

src/sql/platform/scripting/common/scriptingService.ts

@@ -23,7 +23,7 @@ export enum ScriptOperation {
 }
 
 export interface IScriptingService {
-	_serviceBrand: ServiceIdentifier<IScriptingService>;
+	_serviceBrand: undefined;
 
 	script(connectionUri: string, metadata: azdata.ObjectMetadata, operation: ScriptOperation, paramDetails: azdata.ScriptingParamDetails): Thenable<azdata.ScriptingResult>;
 
@@ -50,7 +50,7 @@ export interface IScriptingService {
 
 export class ScriptingService implements IScriptingService {
 
-	public _serviceBrand: ServiceIdentifier<IScriptingService>;
+	_serviceBrand: undefined;
 
 	private _providers: { [handle: string]: azdata.ScriptingProvider; } = Object.create(null);
 

src/sql/platform/serialization/common/serializationService.ts

@@ -39,7 +39,7 @@ export interface SerializeDataParams {
 }
 
 export interface ISerializationService {
-	_serviceBrand: ServiceIdentifier<ISerializationService>;
+	_serviceBrand: undefined;
 
 	registerProvider(providerId: string, provider: azdata.SerializationProvider): void;
 
@@ -61,7 +61,7 @@ function getBatchSize(totalRows: number, currentIndex: number): number {
 
 export class SerializationService implements ISerializationService {
 
-	_serviceBrand: ServiceIdentifier<ISerializationService>;
+	_serviceBrand: undefined;
 
 	private providers: { providerId: string, provider: azdata.SerializationProvider }[] = [];
 

src/sql/platform/serverGroup/common/serverGroupController.ts

@@ -13,7 +13,7 @@ export interface IServerGroupDialogCallbacks {
 }
 export const IServerGroupController = createDecorator<IServerGroupController>('serverGroupController');
 export interface IServerGroupController {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	showCreateGroupDialog(callbacks?: IServerGroupDialogCallbacks): Promise<void>;
 	showEditGroupDialog(group: ConnectionProfileGroup): Promise<void>;
 }

src/sql/platform/tasks/common/tasksService.ts

@@ -18,7 +18,7 @@ export const SERVICE_ID = 'taskHistoryService';
 export const ITaskService = createDecorator<ITaskService>(SERVICE_ID);
 
 export interface ITaskService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	onTaskComplete: Event<TaskNode>;
 	onAddNewTask: Event<TaskNode>;
 	handleNewTask(task: TaskNode): void;
@@ -44,7 +44,7 @@ export interface TaskStatusChangeArgs {
 }
 
 export class TaskService implements ITaskService {
-	public _serviceBrand: any;
+	public _serviceBrand: undefined;
 	private _taskQueue: TaskNode;
 	private _onTaskComplete = new Emitter<TaskNode>();
 	private _onAddNewTask = new Emitter<TaskNode>();
@@ -160,7 +160,7 @@ export class TaskService implements ITaskService {
 			let numOfInprogressTasks = this.getNumberOfInProgressTasks();
 			if (numOfInprogressTasks > 0) {
 				this.dialogService.show(Severity.Warning, message, options).then(choice => {
-					switch (choice) {
+					switch (choice.choice) {
 						case 0:
 							let timeout: any;
 							let isTimeout = false;

src/sql/platform/telemetry/common/adsTelemetryService.ts

@@ -56,7 +56,7 @@ class TelemetryEventImpl implements ITelemetryEvent {
 
 export class AdsTelemetryService implements IAdsTelemetryService {
 
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	constructor(
 		@ITelemetryService private telemetryService: ITelemetryService,

src/sql/platform/telemetry/common/telemetry.ts

@@ -65,7 +65,7 @@ export interface ITelemetryInfo {
 export interface IAdsTelemetryService {
 
 	// ITelemetryService functions
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	setEnabled(value: boolean): void;