Open all closed workspaces on startup

Author: msujew

arduino-ide-extension/src/browser/arduino-workspace-resolver.ts

@@ -61,7 +61,7 @@ export class ArduinoWorkspaceRootResolver {
   // - https://github.com/eclipse-theia/theia/blob/8196e9dcf9c8de8ea0910efeb5334a974f426966/packages/workspace/src/browser/workspace-service.ts#L423
   protected hashToUri(hash: string | undefined): string | undefined {
     if (hash && hash.length > 1 && hash.startsWith('#')) {
-      const path = hash.slice(1); // Trim the leading `#`.
+      const path = decodeURI(hash.slice(1)).replace(/\\/g, '/'); // Trim the leading `#`, decode the URI and replace Windows separators
       return new URI(
         toUnix(path.slice(isWindows && hash.startsWith('/') ? 1 : 0))
       )

arduino-ide-extension/src/electron-main/theia/electron-main-application.ts

@@ -14,13 +14,17 @@ import { ElectronSecurityToken } from '@theia/core/lib/electron-common/electron-
 import { FrontendApplicationConfig } from '@theia/application-package/lib/application-props';
 import {
   ElectronMainApplication as TheiaElectronMainApplication,
+  ElectronMainExecutionParams,
   TheiaBrowserWindowOptions,
 } from '@theia/core/lib/electron-main/electron-main-application';
 import { SplashServiceImpl } from '../splash/splash-service-impl';
 import { ipcMain } from '@theia/core/shared/electron';
+import { URI } from '@theia/core/shared/vscode-uri';
 
 app.commandLine.appendSwitch('disable-http-cache');
 
+const WORKSPACES = 'workspaces';
+
 @injectable()
 export class ElectronMainApplication extends TheiaElectronMainApplication {
   protected _windows: BrowserWindow[] = [];
@@ -36,6 +40,17 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     return super.start(config);
   }
 
+  protected async launch(params: ElectronMainExecutionParams): Promise<void> {
+    const workspaces: string[] | undefined = this.electronStore.get(WORKSPACES);
+    if (workspaces && workspaces.length > 0) {
+      // Setting `secondInstance=true` allows us to pass workspace URIs to the frontend
+      Object.assign(params, { secondInstance: true });
+      await Promise.all(workspaces.map(file => this.handleMainCommand(params, { file })));
+    } else {
+      super.launch(params);
+    }
+  }
+
   protected getTitleBarStyle(): 'native' | 'custom' {
     return 'native';
   }
@@ -148,6 +163,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
         }
       }
     });
+    this.attachClosedWorkspace(electronWindow);
     this.attachReadyToShow(electronWindow);
     this.attachSaveWindowState(electronWindow);
     this.attachGlobalShortcuts(electronWindow);
@@ -218,6 +234,33 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     }
   }
 
+  protected closedWorkspaces: { workspace: string, time: number }[] = [];
+
+  protected attachClosedWorkspace(window: BrowserWindow): void {
+    // Since the `before-quit` event is only fired when closing the *last* window
+    // We need to keep track of recently closed windows/workspaces manually
+    window.on('close', () => {
+      const url = window.webContents.getURL();
+      const workspace = URI.parse(url).fragment;
+      if (workspace) {
+        const workspaceUri = URI.file(workspace);
+        this.closedWorkspaces.push({
+          workspace: workspaceUri.fsPath,
+          time: Date.now()
+        })
+      }
+    });
+  }
+
+  protected onWillQuit(event: Electron.Event): void {
+    // Only add workspaces which were closed within the last second (1000 milliseconds)
+    const threshold = Date.now() - 1000;
+    const workspaces = this.closedWorkspaces.filter(e => e.time > threshold).map(e => e.workspace).sort();
+    this.electronStore.set(WORKSPACES, workspaces);
+
+    super.onWillQuit(event);
+  }
+
   get windows(): BrowserWindow[] {
     return this._windows.slice();
   }