Pass the original argv to the "second instance" handler

Fixes eclipse-theia#14747

Contributed on behalf of STMicroelectronics

Signed-off-by: Thomas Mäder <[email protected]>

Author: tsmaeder

dev-packages/application-manager/src/generator/backend-generator.ts

@@ -64,7 +64,7 @@ const config = ${this.prettyStringify(this.pck.props.frontend.config)};
 const isSingleInstance = ${this.pck.props.backend.config.singleInstance === true ? 'true' : 'false'};
 
 (async () => {
-    if (isSingleInstance && !app.requestSingleInstanceLock()) {
+    if (isSingleInstance && !app.requestSingleInstanceLock(process.argv)) {
         // There is another instance running, exit now. The other instance will request focus.
         app.quit();
         return;

packages/core/src/electron-main/electron-main-application.ts

@@ -741,11 +741,14 @@ export class ElectronMainApplication {
         this.stopContributions();
     }
 
-    protected async onSecondInstance(event: ElectronEvent, argv: string[], cwd: string): Promise<void> {
-        if (argv.includes('--open-url')) {
-            this.openUrl(argv[argv.length - 1]);
+    protected async onSecondInstance(event: ElectronEvent, _: string[], cwd: string, originalArgv: string[]): Promise<void> {
+        // the second instance passes it's original argument array as the fourth argument to this method
+        // The `argv` second parameter is not usable for us since it is mangled by electron before being passed here
+
+        if (originalArgv.includes('--open-url')) {
+            this.openUrl(originalArgv[originalArgv.length - 1]);
         } else {
-            createYargs(this.processArgv.getProcessArgvWithoutBin(argv), process.cwd())
+            createYargs(this.processArgv.getProcessArgvWithoutBin(originalArgv), process.cwd())
                 .help(false)
                 .command('$0 [file]', false,
                     cmd => cmd