Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files

src/sql/workbench/browser/modelComponents/formContainer.component.ts

@@ -29,10 +29,6 @@ export interface TitledFormItemLayout {
 	isGroupLabel?: boolean;
 }
 
-export interface FormLayout {
-	width: number;
-}
-
 class FormItem {
 	constructor(public descriptor: IComponentDescriptor, public config: TitledFormItemLayout) { }
 }

src/sql/workbench/browser/modelComponents/webview.component.ts

@@ -108,7 +108,6 @@ export default class WebViewComponent extends ComponentBase implements IComponen
 		if (this._webview && this.html) {
 			this._renderedHtml = this.html;
 			this._webview.html = this._renderedHtml;
-			this._webview.layout();
 		}
 	}
 
@@ -142,7 +141,6 @@ export default class WebViewComponent extends ComponentBase implements IComponen
 			this._ready.then(() => {
 				let element = <HTMLElement>this._el.nativeElement;
 				element.style.position = this.position;
-				this._webview.layout();
 			});
 		}
 	}

src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts

@@ -53,7 +53,7 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
 	}
 
 	public layout(): void {
-		this._webview.layout();
+		// no op
 	}
 
 	public get id(): string {
@@ -80,7 +80,6 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
 		this._html = html;
 		if (this._webview) {
 			this._webview.html = html;
-			this._webview.layout();
 		}
 	}
 
@@ -113,6 +112,5 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
 		if (this._html) {
 			this._webview.html = this._html;
 		}
-		this._webview.layout();
 	}
 }

src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts

@@ -60,7 +60,6 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget,
 		this._html = html;
 		if (this._webview) {
 			this._webview.html = html;
-			this._webview.layout();
 		}
 	}
 
@@ -81,7 +80,7 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget,
 	}
 
 	public layout(): void {
-		this._webview.layout();
+		// no op
 	}
 
 	public sendMessage(message: string): void {
@@ -111,6 +110,5 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget,
 		if (this._html) {
 			this._webview.html = this._html;
 		}
-		this._webview.layout();
 	}
 }

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

@@ -43,14 +43,7 @@ export class BareResultsGridInfo extends BareFontInfo {
 	protected constructor(fontInfo: BareFontInfo, opts: {
 		cellPadding: number | number[];
 	}) {
-		super({
-			zoomLevel: fontInfo.zoomLevel,
-			fontFamily: fontInfo.fontFamily,
-			fontWeight: fontInfo.fontWeight,
-			fontSize: fontInfo.fontSize,
-			lineHeight: fontInfo.lineHeight,
-			letterSpacing: fontInfo.letterSpacing
-		});
+		super(fontInfo);
 		this.cellPadding = opts.cellPadding;
 	}
 }

src/sql/workbench/services/insights/test/electron-browser/insightsUtils.test.ts

@@ -25,6 +25,7 @@ import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { IWorkbenchConstructionOptions } from 'vs/workbench/workbench.web.api';
 
 class TestEnvironmentService implements IWorkbenchEnvironmentService {
+	argvResource: URI;
 	userDataSyncLogResource: URI;
 	settingsSyncPreviewResource: URI;
 	webviewExternalEndpoint: string;