chore(vscode): update to 1.55.2

lib/vscode/src/vs/base/parts/sandbox/electron-browser/preload.js

@@ -22,6 +22,8 @@
 		/**
 		 * A minimal set of methods exposed from Electron's `ipcRenderer`
 		 * to support communication to main process.
+		 *
+		 * @type {import('../electron-sandbox/electronTypes').IpcRenderer}
 		 */
 		ipcRenderer: {
 
@@ -49,34 +51,46 @@
 			/**
 			 * @param {string} channel
 			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
+			 * @returns {import('../electron-sandbox/electronTypes').IpcRenderer}
 			 */
 			on(channel, listener) {
 				if (validateIPC(channel)) {
 					ipcRenderer.on(channel, listener);
+
+					return this;
 				}
 			},
 
 			/**
 			 * @param {string} channel
 			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
+			 * @returns {import('../electron-sandbox/electronTypes').IpcRenderer}
 			 */
 			once(channel, listener) {
 				if (validateIPC(channel)) {
 					ipcRenderer.once(channel, listener);
+
+					return this;
 				}
 			},
 
 			/**
 			 * @param {string} channel
 			 * @param {(event: import('electron').IpcRendererEvent, ...args: any[]) => void} listener
+			 * @returns {import('../electron-sandbox/electronTypes').IpcRenderer}
 			 */
 			removeListener(channel, listener) {
 				if (validateIPC(channel)) {
 					ipcRenderer.removeListener(channel, listener);
+
+					return this;
 				}
 			}
 		},
 
+		/**
+		 * @type {import('../electron-sandbox/globals').IpcMessagePort}
+		 */
 		ipcMessagePort: {
 
 			/**
@@ -106,6 +120,8 @@
 
 		/**
 		 * Support for subset of methods of Electron's `webFrame` type.
+		 *
+		 * @type {import('../electron-sandbox/electronTypes').WebFrame}
 		 */
 		webFrame: {
 
@@ -121,6 +137,8 @@
 
 		/**
 		 * Support for subset of methods of Electron's `crashReporter` type.
+		 *
+		 * @type {import('../electron-sandbox/electronTypes').CrashReporter}
 		 */
 		crashReporter: {
 
@@ -138,6 +156,8 @@
 		 *
 		 * Note: when `sandbox` is enabled, the only properties available
 		 * are https://github.com/electron/electron/blob/master/docs/api/process.md#sandbox
+		 *
+		 * @type {import('../electron-sandbox/globals').ISandboxNodeProcess}
 		 */
 		process: {
 			get platform() { return process.platform; },
@@ -146,6 +166,21 @@
 			get versions() { return process.versions; },
 			get type() { return 'renderer'; },
 			get execPath() { return process.execPath; },
+			get sandboxed() { return process.sandboxed; },
+
+			/**
+			 * @returns {string}
+			 */
+			cwd() {
+				return process.env['VSCODE_CWD'] || process.execPath.substr(0, process.execPath.lastIndexOf(process.platform === 'win32' ? '\\' : '/'));
+			},
+
+			/**
+			 * @returns {Promise<typeof process.env>}
+			 */
+			getShellEnv() {
+				return shellEnv;
+			},
 
 			/**
 			 * @param {{[key: string]: string}} userEnv
@@ -164,20 +199,17 @@
 
 			/**
 			 * @param {string} type
-			 * @param {() => void} callback
+			 * @param {Function} callback
+			 * @returns {import('../electron-sandbox/globals').ISandboxNodeProcess}
 			 */
 			on(type, callback) {
 				if (validateProcessEventType(type)) {
+					// @ts-ignore
 					process.on(type, callback);
+
+					return this;
 				}
 			}
-		},
-
-		/**
-		 * Some information about the context we are running in.
-		 */
-		context: {
-			get sandbox() { return process.sandboxed; }
 		}
 	};
 
@@ -226,8 +258,8 @@
 		return true;
 	}
 
-	/** @type {Promise<void> | undefined} */
-	let resolvedEnv = undefined;
+	/** @type {Promise<typeof process.env> | undefined} */
+	let shellEnv = undefined;
 
 	/**
 	 * If VSCode is not run from a terminal, we should resolve additional
@@ -238,28 +270,29 @@
 	 * @param {{[key: string]: string}} userEnv
 	 * @returns {Promise<void>}
 	 */
-	function resolveEnv(userEnv) {
-		if (!resolvedEnv) {
+	async function resolveEnv(userEnv) {
+		if (!shellEnv) {
 
 			// Apply `userEnv` directly
 			Object.assign(process.env, userEnv);
 
 			// Resolve `shellEnv` from the main side
-			resolvedEnv = new Promise(function (resolve) {
-				ipcRenderer.once('vscode:acceptShellEnv', function (event, shellEnv) {
+			shellEnv = new Promise(function (resolve) {
+				ipcRenderer.once('vscode:acceptShellEnv', function (event, shellEnvResult) {
+					if (!process.env['VSCODE_SKIP_PROCESS_ENV_PATCHING'] /* TODO@bpasero for https://github.com/microsoft/vscode/issues/108804 */) {
+						// Assign all keys of the shell environment to our process environment
+						// But make sure that the user environment wins in the end over shell environment
+						Object.assign(process.env, shellEnvResult, userEnv);
+					}
 
-					// Assign all keys of the shell environment to our process environment
-					// But make sure that the user environment wins in the end
-					Object.assign(process.env, shellEnv, userEnv);
-
-					resolve();
+					resolve({ ...process.env, ...shellEnvResult, ...userEnv });
 				});
 
 				ipcRenderer.send('vscode:fetchShellEnv');
 			});
 		}
 
-		return resolvedEnv;
+		await shellEnv;
 	}
 
 	//#endregion