Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks

src/sql/workbench/parts/charts/browser/interfaces.ts

@@ -47,6 +47,6 @@ export interface IInsight {
 }
 
 export interface IInsightCtor {
-	new(container: HTMLElement, options: IInsightOptions, ...services: { _serviceBrand: any; }[]): IInsight;
+	new(container: HTMLElement, options: IInsightOptions, ...services: { _serviceBrand: undefined; }[]): IInsight;
 	readonly types: Array<InsightType | ChartType>;
 }

src/sql/workbench/parts/commandLine/test/electron-browser/commandLine.test.ts

@@ -43,24 +43,24 @@ class TestParsedArgs implements ParsedArgs {
 	debugPluginHost?: string;
 	debugSearch?: string;
 	diff?: boolean;
-	'disable-crash-reporter'?: string;
-	'disable-extension'?: string | string[];
+	'disable-crash-reporter'?: boolean;
+	'disable-extension'?: string[]; // undefined or array of 1 or more
 	'disable-extensions'?: boolean;
 	'disable-restore-windows'?: boolean;
 	'disable-telemetry'?: boolean;
-	'disable-updates'?: string;
+	'disable-updates'?: boolean;
 	'driver'?: string;
-	'enable-proposed-api'?: string | string[];
+	'enable-proposed-api'?: string[];
 	'export-default-configuration'?: string;
 	'extensions-dir'?: string;
-	extensionDevelopmentPath?: string;
+	extensionDevelopmentPath?: string[];
 	extensionTestsPath?: string;
 	'file-chmod'?: boolean;
 	'file-write'?: boolean;
-	'folder-uri'?: string | string[];
+	'folder-uri'?: string[];
 	goto?: boolean;
 	help?: boolean;
-	'install-extension'?: string | string[];
+	'install-extension'?: string[];
 	'install-source'?: string;
 	integrated?: boolean;
 	'list-extensions'?: boolean;
@@ -72,7 +72,7 @@ class TestParsedArgs implements ParsedArgs {
 	'open-url'?: boolean;
 	performance?: boolean;
 	'prof-append-timers'?: string;
-	'prof-startup'?: string;
+	'prof-startup'?: boolean;
 	'prof-startup-prefix'?: string;
 	'reuse-window'?: boolean;
 	server?: string;
@@ -82,7 +82,7 @@ class TestParsedArgs implements ParsedArgs {
 	'skip-release-notes'?: boolean;
 	status?: boolean;
 	'sticky-quickopen'?: boolean;
-	'uninstall-extension'?: string | string[];
+	'uninstall-extension'?: string[];
 	'unity-launch'?: boolean; // Always open a new window, except if opening the first window or opening a file or folder as part of the launch.
 	'upload-logs'?: string;
 	user?: string;

src/sql/workbench/parts/notebook/test/electron-browser/cell.test.ts

@@ -269,13 +269,13 @@ suite('Cell Model', function (): void {
 				metadata: { language: 'python' },
 				execution_count: 1
 			}, {
-					notebook: new NotebookModelStub({
-						name: '',
-						version: '',
-						mimetype: 'x-scala'
-					}),
-					isTrusted: false
-				});
+				notebook: new NotebookModelStub({
+					name: '',
+					version: '',
+					mimetype: 'x-scala'
+				}),
+				isTrusted: false
+			});
 		});
 
 		test('should send and handle incoming messages', async () => {

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

@@ -23,7 +23,7 @@ export const SERVICE_ID = 'oeShimService';
 export const IOEShimService = createDecorator<IOEShimService>(SERVICE_ID);
 
 export interface IOEShimService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 	getChildren(node: ITreeItem, viewId: string): Promise<ITreeItem[]>;
 	disconnectNode(viewId: string, node: ITreeItem): Promise<boolean>;
 	providerExists(providerId: string): boolean;
@@ -32,7 +32,7 @@ export interface IOEShimService {
 }
 
 export class OEShimService extends Disposable implements IOEShimService {
-	_serviceBrand: any;
+	_serviceBrand: undefined;
 
 	private sessionMap = new Map<number, string>();
 	private nodeHandleMap = new Map<number, string>();

src/sql/workbench/parts/objectExplorer/test/browser/connectionTreeActions.test.ts

@@ -107,7 +107,7 @@ suite('SQL Connection Tree Action tests', () => {
 		});
 
 		const viewsService = new class implements IViewsService {
-			_serviceBrand: ServiceIdentifier<any>;
+			_serviceBrand: undefined;
 			openView(id: string, focus?: boolean): Promise<IView> {
 				return Promise.resolve({
 					id: '',

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

@@ -382,9 +382,9 @@ export class ProfilerEditor extends BaseEditor {
 				}
 			]
 		}, {
-				forceFitColumns: true,
-				dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
-			});
+			forceFitColumns: true,
+			dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
+		});
 
 		this._detailTableData.onRowCountChange(() => {
 			this._detailTable.updateRowCount();

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

@@ -17,7 +17,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { Event, Emitter } from 'vs/base/common/event';
 import { generateUuid } from 'vs/base/common/uuid';
-import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+import { IDialogService, IShowResult } 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';
@@ -291,11 +291,11 @@ export class ProfilerInput extends EditorInput implements IProfilerSession {
 					nls.localize('profilerClosingActions.yes', "Yes"),
 					nls.localize('profilerClosingActions.no', "No"),
 					nls.localize('profilerClosingActions.cancel', "Cancel")
-				]).then((selection: number) => {
-					if (selection === 0) {
+				]).then((selection: IShowResult) => {
+					if (selection.choice === 0) {
 						this._profilerService.stopSession(this.id);
 						return ConfirmResult.DONT_SAVE;
-					} else if (selection === 1) {
+					} else if (selection.choice === 1) {
 						return ConfirmResult.DONT_SAVE;
 					} else {
 						return ConfirmResult.CANCEL;

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

@@ -92,8 +92,8 @@ export class ProfilerTableEditor extends BaseEditor implements IProfilerControll
 				}
 			}
 		}, {
-				dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
-			});
+			dataItemColumnValueExtractor: slickGridDataItemColumnValueExtractor
+		});
 		this._profilerTable.setSelectionModel(new RowSelectionModel());
 		const copyKeybind = new CopyKeybind();
 		copyKeybind.onCopy((e) => {

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

@@ -28,9 +28,9 @@ export class BareResultsGridInfo extends BareFontInfo {
 	public static createFromRawSettings(opts: {
 		fontFamily?: string;
 		fontWeight?: string;
-		fontSize?: number | string;
-		lineHeight?: number | string;
-		letterSpacing?: number | string;
+		fontSize?: number;
+		lineHeight?: number;
+		letterSpacing?: number;
 		cellPadding?: number | number[];
 	}, zoomLevel: number): BareResultsGridInfo {
 		let cellPadding = !types.isUndefinedOrNull(opts.cellPadding) ? opts.cellPadding : RESULTS_GRID_DEFAULTS.cellPadding;

src/sql/workbench/parts/queryHistory/browser/queryHistoryView.ts

@@ -75,10 +75,10 @@ export class QueryHistoryView extends Disposable {
 		return new Tree(treeContainer, {
 			dataSource, renderer, controller, dnd, filter, sorter, accessibilityProvider
 		}, {
-				indentPixels: 10,
-				twistiePixels: 20,
-				ariaLabel: localize({ key: 'queryHistory.regTreeAriaLabel', comment: ['QueryHistory'] }, "Query History")
-			});
+			indentPixels: 10,
+			twistiePixels: 20,
+			ariaLabel: localize({ key: 'queryHistory.regTreeAriaLabel', comment: ['QueryHistory'] }, "Query History")
+		});
 	}
 
 	public refreshTree(): void {

src/sql/workbench/parts/tasks/browser/tasksView.ts

@@ -90,10 +90,10 @@ export class TaskHistoryView extends Disposable {
 		return new Tree(treeContainer, {
 			dataSource, renderer, controller, dnd, filter, sorter, accessibilityProvider
 		}, {
-				indentPixels: 10,
-				twistiePixels: 20,
-				ariaLabel: localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, "Task history")
-			});
+			indentPixels: 10,
+			twistiePixels: 20,
+			ariaLabel: localize({ key: 'taskHistory.regTreeAriaLabel', comment: ['TaskHistory'] }, "Task history")
+		});
 	}
 
 	private updateTask(task: TaskNode): void {