use contribution instead of rebind

Signed-off-by: Jonah Iden <[email protected]>

Author: jonah-iden

Diff for: packages/remote/src/electron-browser/remote-frontend-module.ts

@@ -37,8 +37,8 @@ import { RemoteUserStorageContribution } from './remote-user-storage-provider';
 import { remoteFileSystemPath, RemoteFileSystemProxyFactory, RemoteFileSystemServer } from '@theia/filesystem/lib/common/remote-file-system-provider';
 import { LocalEnvVariablesServer, LocalRemoteFileSystemContribution, LocalRemoteFileSystemProvider, LocalRemoteFileSytemServer } from './local-backend-services';
 import { envVariablesPath, EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { WorkspaceService } from '@theia/workspace/lib/browser';
-import { RemoteWorkspaceService } from './remote-workspace-service';
+import { WorkspaceHandlingContribution, WorkspaceOpenHandlerContribution } from '@theia/workspace/lib/browser';
+import { RemoteLocalWorkspaceContribution } from './remote-local-workspace-contribution';
 import { FileServiceContribution } from '@theia/filesystem/lib/browser/file-service';
 
 export default new ContainerModule((bind, _, __, rebind) => {
@@ -85,7 +85,9 @@ export default new ContainerModule((bind, _, __, rebind) => {
     rebind(UserStorageContribution).to(RemoteUserStorageContribution);
 
     if (isRemote) {
-        rebind(WorkspaceService).to(RemoteWorkspaceService).inSingletonScope();
+        bind(RemoteLocalWorkspaceContribution).toSelf().inSingletonScope();
+        bind(WorkspaceOpenHandlerContribution).toService(RemoteLocalWorkspaceContribution);
+        bind(WorkspaceHandlingContribution).toService(RemoteLocalWorkspaceContribution);
         bind(LocalRemoteFileSystemContribution).toSelf().inSingletonScope();
         bind(FileServiceContribution).toService(LocalRemoteFileSystemContribution);
     }

Diff for: packages/remote/src/electron-browser/remote-workspace-service.ts renamed to packages/remote/src/electron-browser/remote-local-workspace-contribution.ts

@@ -14,25 +14,34 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { URI } from '@theia/core';
+import { ILogger, MaybePromise, URI } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { WorkspaceInput, WorkspaceService } from '@theia/workspace/lib/browser';
+import { WorkspaceHandlingContribution, WorkspaceInput, WorkspaceOpenHandlerContribution, WorkspacePreferences } from '@theia/workspace/lib/browser';
 import { LOCAL_FILE_SCHEME } from './local-backend-services';
 import { CURRENT_PORT_PARAM, LOCAL_PORT_PARAM, getCurrentPort, getLocalPort } from '@theia/core/lib/electron-browser/messaging/electron-local-ws-connection-source';
 import { RemoteStatusService } from '../electron-common/remote-status-service';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
 
 @injectable()
-export class RemoteWorkspaceService extends WorkspaceService {
+export class RemoteLocalWorkspaceContribution implements WorkspaceOpenHandlerContribution, WorkspaceHandlingContribution {
 
     @inject(RemoteStatusService)
     protected readonly remoteStatusService: RemoteStatusService;
 
-    override canHandle(uri: URI): boolean {
-        return super.canHandle(uri) || uri.scheme === LOCAL_FILE_SCHEME;
+    @inject(WindowService)
+    protected readonly windowService: WindowService;
+
+    @inject(ILogger)
+    protected logger: ILogger;
+
+    @inject(WorkspacePreferences)
+    protected preferences: WorkspacePreferences;
+
+    canHandle(uri: URI): boolean {
+        return uri.scheme === LOCAL_FILE_SCHEME;
     }
 
-    override async recentWorkspaces(): Promise<string[]> {
-        const workspaces = await super.recentWorkspaces();
+    async modifyRecentWorksapces(workspaces: string[]): Promise<string[]> {
         return workspaces.map(workspace => {
             const uri = new URI(workspace);
             if (uri.scheme === 'file') {
@@ -43,15 +52,28 @@ export class RemoteWorkspaceService extends WorkspaceService {
         });
     }
 
-    protected override reloadWindow(options?: WorkspaceInput): void {
+    openWorkspace(uri: URI, options?: WorkspaceInput | undefined): MaybePromise<void> {
+        const workspacePath = uri.path.toString();
+
+        if (this.preferences['workspace.preserveWindow'] || (options && options.preserveWindow)) {
+            this.reloadWindow(workspacePath);
+        } else {
+            try {
+                this.openNewWindow(workspacePath);
+            } catch (error) {
+                this.logger.error(error.toString()).then(() => this.reloadWindow(workspacePath));
+            }
+        }
+    }
+
+    protected reloadWindow(workspacePath: string): void {
         const currentPort = getCurrentPort();
-        const url = this.getModifiedUrl();
-        history.replaceState(undefined, '', url.toString());
         this.remoteStatusService.connectionClosed(parseInt(currentPort ?? '0'));
-        super.reloadWindow(options);
+        const searchParams = this.getModifiedUrl().searchParams;
+        this.windowService.reload({ hash: encodeURI(workspacePath), search: Object.fromEntries(searchParams) });
     }
 
-    protected override openNewWindow(workspacePath: string, options?: WorkspaceInput): void {
+    protected openNewWindow(workspacePath: string): void {
         const url = this.getModifiedUrl();
         url.hash = encodeURI(workspacePath);
         this.windowService.openNewWindow(url.toString());

Diff for: packages/workspace/src/browser/workspace-frontend-module.ts

@@ -32,7 +32,7 @@ import { LabelProviderContribution } from '@theia/core/lib/browser/label-provide
 import { VariableContribution } from '@theia/variable-resolver/lib/browser';
 import { WorkspaceServer, workspacePath, UntitledWorkspaceService, WorkspaceFileService } from '../common';
 import { WorkspaceFrontendContribution } from './workspace-frontend-contribution';
-import { WorkspaceOpenHandlerContribution, WorkspaceService } from './workspace-service';
+import { WorkspaceHandlingContribution, WorkspaceOpenHandlerContribution, WorkspaceService } from './workspace-service';
 import { WorkspaceCommandContribution, FileMenuContribution, EditMenuContribution } from './workspace-commands';
 import { WorkspaceVariableContribution } from './workspace-variable-contribution';
 import { WorkspaceStorageService } from './workspace-storage-service';
@@ -60,6 +60,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
     bindWorkspacePreferences(bind);
     bindWorkspaceTrustPreferences(bind);
     bindContributionProvider(bind, WorkspaceOpenHandlerContribution);
+    bindContributionProvider(bind, WorkspaceHandlingContribution);
 
     bind(WorkspaceService).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(WorkspaceService);

Diff for: packages/workspace/src/browser/workspace-service.ts

@@ -44,9 +44,9 @@ export interface WorkspaceOpenHandlerContribution {
     getWorkspaceLabel?(uri: URI): MaybePromise<string | undefined>;
 }
 
+export const WorkspaceHandlingContribution = Symbol('WorkspaceHandlingContribution');
 export interface WorkspaceHandlingContribution {
     modifyRecentWorksapces?(workspaces: string[]): MaybePromise<string[]>;
-
 }
 
 /**
@@ -108,6 +108,9 @@ export class WorkspaceService implements FrontendApplicationContribution, Worksp
     @inject(ContributionProvider) @named(WorkspaceOpenHandlerContribution)
     protected readonly openHandlerContribution: ContributionProvider<WorkspaceOpenHandlerContribution>;
 
+    @inject(ContributionProvider) @named(WorkspaceHandlingContribution)
+    protected readonly workspaceHandlingContribution: ContributionProvider<WorkspaceHandlingContribution>;
+
     protected _ready = new Deferred<void>();
     get ready(): Promise<void> {
         return this._ready.promise;
@@ -336,7 +339,15 @@ export class WorkspaceService implements FrontendApplicationContribution, Worksp
     }
 
     async recentWorkspaces(): Promise<string[]> {
-        return this.server.getRecentWorkspaces();
+        let recentWorkspaces = await this.server.getRecentWorkspaces();
+
+        for (const handler of this.workspaceHandlingContribution.getContributions()) {
+            if (handler.modifyRecentWorksapces) {
+                recentWorkspaces = await handler.modifyRecentWorksapces(recentWorkspaces);
+            }
+        }
+
+        return recentWorkspaces;
     }
 
     async removeRecentWorkspace(uri: string): Promise<void> {