src/Tools/VSCode/patches/cli.patch
author nipkow
Tue, 17 Jun 2025 14:11:40 +0200
changeset 82733 8b537e1af2ec
parent 75279 9229f2681db7
permissions -rw-r--r--
reinstated intersection of lists as inter_list_set
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
75277
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
     1
diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
     2
--- a/src/vs/code/node/cli.ts
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
     3
+++ b/src/vs/code/node/cli.ts
75279
9229f2681db7 clarified directory layout and settings: more robust on all platforms;
wenzelm
parents: 75277
diff changeset
     4
@@ -363,9 +363,11 @@ export async function main(argv: string[]): Promise<any> {
75277
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
     5
 		}
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
     6
 
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
     7
 		let child: ChildProcess;
75279
9229f2681db7 clarified directory layout and settings: more robust on all platforms;
wenzelm
parents: 75277
diff changeset
     8
+		const app_arg = '--app=' + process.env['ISABELLE_VSCODIUM_APP'];
75277
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
     9
+		const electron_args = [app_arg].concat(argv.slice(2));
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    10
 		if (!isMacOSBigSurOrNewer) {
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    11
 			// We spawn process.execPath directly
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    12
-			child = spawn(process.execPath, argv.slice(2), options);
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    13
+			child = spawn(process.execPath, electron_args, options);
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    14
 		} else {
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    15
 			// On Big Sur, we spawn using the open command to obtain behavior
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    16
 			// similar to if the app was launched from the dock
75279
9229f2681db7 clarified directory layout and settings: more robust on all platforms;
wenzelm
parents: 75277
diff changeset
    17
@@ -425,7 +427,7 @@ export async function main(argv: string[]): Promise<any> {
75277
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    18
 				}
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    19
 			}
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    20
 
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    21
-			spawnArgs.push('--args', ...argv.slice(2)); // pass on our arguments
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    22
+			spawnArgs.push('--args', ...electron_args); // pass on our arguments
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    23
 
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    24
 			if (env['VSCODE_DEV']) {
f64725832d63 support Electron application framework;
wenzelm
parents:
diff changeset
    25
 				// If we're in development mode, replace the . arg with the