Merge vscode source through 1.62 release (#19981)

* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check

extensions/simple-browser/package.json

@@ -24,7 +24,8 @@
     "onCommand:simpleBrowser.show",
     "onCommand:simpleBrowser.api.open",
     "onOpenExternalUri:http",
-    "onOpenExternalUri:https"
+    "onOpenExternalUri:https",
+    "onWebviewPanel:simpleBrowser.view"
   ],
   "capabilities": {
     "virtualWorkspaces": true,
@@ -65,7 +66,7 @@
     "watch-web": "npx webpack-cli --config extension-browser.webpack.config --mode none --watch --info-verbosity verbose"
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.2.8",
+    "vscode-extension-telemetry": "0.4.2",
     "vscode-nls": "^5.0.0"
   },
   "devDependencies": {

extensions/simple-browser/preview-src/index.ts

@@ -101,6 +101,8 @@ onceDocumentLoaded(() => {
 		} catch {
 			iframe.src = rawUrl;
 		}
+
+		vscode.setState({ url: rawUrl });
 	}
 });
 

extensions/simple-browser/src/extension.ts

@@ -6,6 +6,7 @@
 import * as vscode from 'vscode';
 import * as nls from 'vscode-nls';
 import { SimpleBrowserManager } from './simpleBrowserManager';
+import { SimpleBrowserView } from './simpleBrowserView';
 
 declare class URL {
 	constructor(input: string, base?: string | URL);
@@ -38,6 +39,12 @@ export function activate(context: vscode.ExtensionContext) {
 	const manager = new SimpleBrowserManager(context.extensionUri);
 	context.subscriptions.push(manager);
 
+	context.subscriptions.push(vscode.window.registerWebviewPanelSerializer(SimpleBrowserView.viewType, {
+		deserializeWebviewPanel: async (panel, state) => {
+			manager.restore(panel, state);
+		}
+	}));
+
 	context.subscriptions.push(vscode.commands.registerCommand(showCommand, async (url?: string) => {
 		if (!url) {
 			url = await vscode.window.showInputBox({

extensions/simple-browser/src/simpleBrowserManager.ts

@@ -23,16 +23,27 @@ export class SimpleBrowserManager {
 		if (this._activeView) {
 			this._activeView.show(url, options);
 		} else {
-			const view = new SimpleBrowserView(this.extensionUri, url, options);
-			view.onDispose(() => {
-				if (this._activeView === view) {
-					this._activeView = undefined;
-				}
-			});
+			const view = SimpleBrowserView.create(this.extensionUri, url, options);
+			this.registerWebviewListeners(view);
 
 			this._activeView = view;
 		}
 	}
+
+	public restore(panel: vscode.WebviewPanel, state: any): void {
+		const url = state?.url ?? '';
+		const view = SimpleBrowserView.restore(this.extensionUri, url, panel);
+		this.registerWebviewListeners(view);
+		return;
+	}
+
+	private registerWebviewListeners(view: SimpleBrowserView) {
+		view.onDispose(() => {
+			if (this._activeView === view) {
+				this._activeView = undefined;
+			}
+		});
+	}
+
 }
 
-

extensions/simple-browser/src/simpleBrowserView.ts

@@ -24,23 +24,41 @@ export class SimpleBrowserView extends Disposable {
 	private readonly _onDidDispose = this._register(new vscode.EventEmitter<void>());
 	public readonly onDispose = this._onDidDispose.event;
 
-	constructor(
-		private readonly extensionUri: vscode.Uri,
+	public static create(
+		extensionUri: vscode.Uri,
 		url: string,
 		showOptions?: ShowOptions
-	) {
-		super();
-
-		this._webviewPanel = this._register(vscode.window.createWebviewPanel(SimpleBrowserView.viewType, SimpleBrowserView.title, {
+	): SimpleBrowserView {
+		const webview = vscode.window.createWebviewPanel(SimpleBrowserView.viewType, SimpleBrowserView.title, {
 			viewColumn: showOptions?.viewColumn ?? vscode.ViewColumn.Active,
 			preserveFocus: showOptions?.preserveFocus
 		}, {
 			enableScripts: true,
+			enableForms: true,
 			retainContextWhenHidden: true,
 			localResourceRoots: [
 				vscode.Uri.joinPath(extensionUri, 'media')
 			]
-		}));
+		});
+		return new SimpleBrowserView(extensionUri, url, webview);
+	}
+
+	public static restore(
+		extensionUri: vscode.Uri,
+		url: string,
+		webview: vscode.WebviewPanel,
+	): SimpleBrowserView {
+		return new SimpleBrowserView(extensionUri, url, webview);
+	}
+
+	private constructor(
+		private readonly extensionUri: vscode.Uri,
+		url: string,
+		webviewPanel: vscode.WebviewPanel,
+	) {
+		super();
+
+		this._webviewPanel = this._register(webviewPanel);
 
 		this._register(this._webviewPanel.webview.onDidReceiveMessage(e => {
 			switch (e.type) {

extensions/simple-browser/yarn.lock

@@ -12,10 +12,10 @@ vscode-codicons@^0.0.14:
   resolved "https://registry.yarnpkg.com/vscode-codicons/-/vscode-codicons-0.0.14.tgz#e0d05418e2e195564ff6f6a2199d70415911c18f"
   integrity sha512-6CEH5KT9ct5WMw7n5dlX7rB8ya4CUI2FSq1Wk36XaW+c5RglFtAanUV0T+gvZVVFhl/WxfjTvFHq06Hz9c1SLA==
 
-vscode-extension-telemetry@0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.2.8.tgz#670c625c44791237c040cee2cb9f567ca34784ac"
-  integrity sha512-Vf52im5qzORRD2K5Ryp8PXo31YXVcJAYRSDDZGegWlt0OATOd83DYabS1U/WIq9nR5g80UQKH3+BsenhpQHUaA==
+vscode-extension-telemetry@0.4.2:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/vscode-extension-telemetry/-/vscode-extension-telemetry-0.4.2.tgz#6ef847a80c9cfc207eb15e3a254f235acebb65a5"
+  integrity sha512-y0f51mVoFxHIzULQNCC26TBFIKdEC7uckS3tFoK++OOOl8mU2LlOxgmbd52T/SXoXNg5aI7xqs+4V2ug5ITvKw==
 
 vscode-nls@^5.0.0:
   version "5.0.0"