Switch single instance on per default.

Also implements VS Code-like behavior when opening second instances Contributed on behalf of STMicroelectronics Signed-off-by: Thomas Mäder <[email protected]>
eclipse-theia · Jun 20, 2024 · b492405 · b492405
1 parent 8d2d0c6
commit b492405
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/dev-packages/application-package/src/application-props.ts b/dev-packages/application-package/src/application-props.ts
@@ -183,7 +183,7 @@ export namespace FrontendApplicationConfig {
 export type BackendApplicationConfig = RequiredRecursive<BackendApplicationConfig.Partial>;
 export namespace BackendApplicationConfig {
     export const DEFAULT: BackendApplicationConfig = {
-        singleInstance: false,
+        singleInstance: true,
         frontendConnectionTimeout: 0
     };
     export interface Partial extends ApplicationConfig {

diff --git a/packages/core/src/electron-main/electron-main-application.ts b/packages/core/src/electron-main/electron-main-application.ts
@@ -721,14 +721,19 @@ export class ElectronMainApplication {
     }
 
     protected async onSecondInstance(event: ElectronEvent, argv: string[], cwd: string): Promise<void> {
-        const electronWindows = BrowserWindow.getAllWindows();
-        if (electronWindows.length > 0) {
-            const electronWindow = electronWindows[0];
-            if (electronWindow.isMinimized()) {
-                electronWindow.restore();
-            }
-            electronWindow.focus();
-        }
+        createYargs(this.processArgv.getProcessArgvWithoutBin(argv), process.cwd())
+        .help(false)
+        .command('$0 [file]', false,
+            cmd => cmd
+                .positional('file', { type: 'string' }),
+                async args => {
+                    this.handleMainCommand({
+                        file: args.file,
+                        cwd: process.cwd(),
+                        secondInstance: true
+                    });
+                },
+            ).parse();
     }
 
     protected onWindowAllClosed(event: ElectronEvent): void {