@theia/remote 1.70.0-next.7 → 1.70.0-next.71

package/lib/electron-browser/local-backend-services.d.ts

@@ -1,11 +1,17 @@
 import { RpcProxy } from '@theia/core';
 import { RemoteFileSystemProvider, RemoteFileSystemServer } from '@theia/filesystem/lib/common/remote-file-system-provider';
+import { FileService, FileServiceContribution } from '@theia/filesystem/lib/browser/file-service';
 export declare const LocalEnvVariablesServer: unique symbol;
 export declare const LocalRemoteFileSytemServer: unique symbol;
+export declare const LOCAL_FILE_SCHEME = "localfile";
 /**
  * provide file access to local files while connected to a remote workspace or dev container.
  */
 export declare class LocalRemoteFileSystemProvider extends RemoteFileSystemProvider {
     protected readonly server: RpcProxy<RemoteFileSystemServer>;
 }
+export declare class LocalRemoteFileSystemContribution implements FileServiceContribution {
+    protected readonly provider: LocalRemoteFileSystemProvider;
+    registerFileSystemProviders(service: FileService): void;
+}
 //# sourceMappingURL=local-backend-services.d.ts.map

package/lib/electron-browser/local-backend-services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-backend-services.d.ts","sourceRoot":"","sources":["../../src/electron-browser/local-backend-services.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAE5H,eAAO,MAAM,uBAAuB,eAA0C,CAAC;AAC/E,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAE/E;;GAEG;AACH,qBACa,6BAA8B,SAAQ,wBAAwB;IACvE,mBAC4B,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC;CACxE"}
+{"version":3,"file":"local-backend-services.d.ts","sourceRoot":"","sources":["../../src/electron-browser/local-backend-services.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,QAAQ,EAAO,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,wBAAwB,EAAE,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAC5H,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAElG,eAAO,MAAM,uBAAuB,eAA0C,CAAC;AAC/E,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAE/E,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAC7C;;GAEG;AACH,qBACa,6BAA8B,SAAQ,wBAAwB;IACvE,mBAC4B,MAAM,EAAE,QAAQ,CAAC,sBAAsB,CAAC,CAAC;CAExE;AAED,qBACa,iCAAkC,YAAW,uBAAuB;IAE7E,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,6BAA6B,CAAC;IAE3D,2BAA2B,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI;CA0B1D"}

package/lib/electron-browser/local-backend-services.js

@@ -15,12 +15,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalRemoteFileSystemProvider = exports.LocalRemoteFileSytemServer = exports.LocalEnvVariablesServer = void 0;
+exports.LocalRemoteFileSystemContribution = exports.LocalRemoteFileSystemProvider = exports.LOCAL_FILE_SCHEME = exports.LocalRemoteFileSytemServer = exports.LocalEnvVariablesServer = void 0;
 const tslib_1 = require("tslib");
+const core_1 = require("@theia/core");
 const inversify_1 = require("@theia/core/shared/inversify");
 const remote_file_system_provider_1 = require("@theia/filesystem/lib/common/remote-file-system-provider");
 exports.LocalEnvVariablesServer = Symbol('LocalEnviromentVariableServer');
 exports.LocalRemoteFileSytemServer = Symbol('LocalRemoteFileSytemServer');
+exports.LOCAL_FILE_SCHEME = 'localfile';
 /**
  * provide file access to local files while connected to a remote workspace or dev container.
  */
@@ -34,4 +36,38 @@ tslib_1.__decorate([
 exports.LocalRemoteFileSystemProvider = LocalRemoteFileSystemProvider = tslib_1.__decorate([
     (0, inversify_1.injectable)()
 ], LocalRemoteFileSystemProvider);
+let LocalRemoteFileSystemContribution = class LocalRemoteFileSystemContribution {
+    registerFileSystemProviders(service) {
+        service.onWillActivateFileSystemProvider(event => {
+            if (event.scheme === exports.LOCAL_FILE_SCHEME) {
+                // This provider currently has limited functionality. It can not yet be used to react to listener events like onDidChangeFile
+                service.registerProvider(exports.LOCAL_FILE_SCHEME, new Proxy(this.provider, {
+                    get(target, prop) {
+                        const member = target[prop];
+                        if (typeof member === 'function') {
+                            return (...args) => {
+                                const mappedArgs = args.map(arg => {
+                                    if (arg instanceof core_1.URI && arg.scheme === exports.LOCAL_FILE_SCHEME) {
+                                        return arg.withScheme('file');
+                                    }
+                                    return arg;
+                                });
+                                return member.apply(target, mappedArgs);
+                            };
+                        }
+                        return member;
+                    }
+                }));
+            }
+        });
+    }
+};
+exports.LocalRemoteFileSystemContribution = LocalRemoteFileSystemContribution;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(LocalRemoteFileSystemProvider),
+    tslib_1.__metadata("design:type", LocalRemoteFileSystemProvider)
+], LocalRemoteFileSystemContribution.prototype, "provider", void 0);
+exports.LocalRemoteFileSystemContribution = LocalRemoteFileSystemContribution = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], LocalRemoteFileSystemContribution);
 //# sourceMappingURL=local-backend-services.js.map

package/lib/electron-browser/local-backend-services.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-backend-services.js","sourceRoot":"","sources":["../../src/electron-browser/local-backend-services.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,4DAAkE;AAClE,0GAA4H;AAE/G,QAAA,uBAAuB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AAClE,QAAA,0BAA0B,GAAG,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAE/E;;GAEG;AAEI,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,sDAAwB;CAG1E,CAAA;AAHY,sEAA6B;AAEV;IAD3B,IAAA,kBAAM,EAAC,kCAA0B,CAAC;;6DACkC;wCAF5D,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAGzC"}
+{"version":3,"file":"local-backend-services.js","sourceRoot":"","sources":["../../src/electron-browser/local-backend-services.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,sCAA4C;AAC5C,4DAAkE;AAClE,0GAA4H;AAG/G,QAAA,uBAAuB,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AAClE,QAAA,0BAA0B,GAAG,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAElE,QAAA,iBAAiB,GAAG,WAAW,CAAC;AAC7C;;GAEG;AAEI,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,sDAAwB;CAI1E,CAAA;AAJY,sEAA6B;AAEV;IAD3B,IAAA,kBAAM,EAAC,kCAA0B,CAAC;;6DACkC;wCAF5D,6BAA6B;IADzC,IAAA,sBAAU,GAAE;GACA,6BAA6B,CAIzC;AAGM,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAI1C,2BAA2B,CAAC,OAAoB;QAC5C,OAAO,CAAC,gCAAgC,CAAC,KAAK,CAAC,EAAE;YAC7C,IAAI,KAAK,CAAC,MAAM,KAAK,yBAAiB,EAAE,CAAC;gBACrC,6HAA6H;gBAC7H,OAAO,CAAC,gBAAgB,CAAC,yBAAiB,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACjE,GAAG,CAAC,MAAM,EAAE,IAAI;wBACZ,MAAM,MAAM,GAAG,MAAM,CAAC,IAA2C,CAAC,CAAC;wBAEnE,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;4BAC/B,OAAO,CAAC,GAAG,IAAe,EAAE,EAAE;gCAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oCAC9B,IAAI,GAAG,YAAY,UAAG,IAAI,GAAG,CAAC,MAAM,KAAK,yBAAiB,EAAE,CAAC;wCACzD,OAAO,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;oCAClC,CAAC;oCACD,OAAO,GAAG,CAAC;gCACf,CAAC,CAAC,CAAC;gCACH,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;4BAC5C,CAAC,CAAC;wBACN,CAAC;wBACD,OAAO,MAAM,CAAC;oBAClB,CAAC;iBACJ,CAAC,CAAC,CAAC;YACR,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CAEJ,CAAA;AA9BY,8EAAiC;AAEvB;IADlB,IAAA,kBAAM,EAAC,6BAA6B,CAAC;sCACT,6BAA6B;mEAAC;4CAFlD,iCAAiC;IAD7C,IAAA,sBAAU,GAAE;GACA,iCAAiC,CA8B7C"}

package/lib/electron-browser/remote-electron-file-dialog-service.d.ts

@@ -10,5 +10,6 @@ export declare class RemoteElectronFileDialogService extends ElectronFileDialogS
     }, folder?: FileStat | undefined): Promise<MaybeArray<URI> | undefined>;
     showOpenDialog(props: OpenFileDialogProps, folder?: FileStat | undefined): Promise<URI | undefined>;
     showSaveDialog(props: SaveFileDialogProps, folder?: FileStat | undefined): Promise<URI | undefined>;
+    protected addLocalFilesButton(props: OpenFileDialogProps): void;
 }
 //# sourceMappingURL=remote-electron-file-dialog-service.d.ts.map

package/lib/electron-browser/remote-electron-file-dialog-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-electron-file-dialog-service.d.ts","sourceRoot":"","sources":["../../src/electron-browser/remote-electron-file-dialog-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iFAAiF,CAAC;AAC5H,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,qBACa,+BAAgC,SAAQ,yBAAyB;IAEnD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAE9D,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG;QAAE,aAAa,EAAE,IAAI,CAAC;KAAE,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IAC1I,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IASnG,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CAO/G"}
+{"version":3,"file":"remote-electron-file-dialog-service.d.ts","sourceRoot":"","sources":["../../src/electron-browser/remote-electron-file-dialog-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,GAAG,EAAO,MAAM,aAAa,CAAC;AAEnD,OAAO,EAA8B,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AACjI,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iFAAiF,CAAC;AAC5H,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,qBACa,+BAAgC,SAAQ,yBAAyB;IAEnD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAE9D,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG;QAAE,aAAa,EAAE,IAAI,CAAC;KAAE,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IAC1I,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAUnG,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IAQ5G,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;CAgBlE"}

package/lib/electron-browser/remote-electron-file-dialog-service.js

@@ -17,13 +17,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoteElectronFileDialogService = void 0;
 const tslib_1 = require("tslib");
+const core_1 = require("@theia/core");
 const inversify_1 = require("@theia/core/shared/inversify");
 const file_dialog_service_1 = require("@theia/filesystem/lib/browser/file-dialog/file-dialog-service");
 const electron_file_dialog_service_1 = require("@theia/filesystem/lib/electron-browser/file-dialog/electron-file-dialog-service");
 const remote_service_1 = require("./remote-service");
+const local_backend_services_1 = require("./local-backend-services");
 let RemoteElectronFileDialogService = class RemoteElectronFileDialogService extends electron_file_dialog_service_1.ElectronFileDialogService {
     showOpenDialog(props, folder) {
         if (this.remoteService.isConnected()) {
+            this.addLocalFilesButton(props);
             return file_dialog_service_1.DefaultFileDialogService.prototype.showOpenDialog.call(this, props, folder);
         }
         else {
@@ -38,6 +41,23 @@ let RemoteElectronFileDialogService = class RemoteElectronFileDialogService exte
             return super.showSaveDialog(props, folder);
         }
     }
+    addLocalFilesButton(props) {
+        const localFilesButton = {
+            label: core_1.nls.localizeByDefault('Show Local'),
+            onClick: async (resolve) => {
+                const localFile = await super.showOpenDialog({ ...props, fileScheme: local_backend_services_1.LOCAL_FILE_SCHEME });
+                if (localFile) {
+                    resolve({ uri: localFile });
+                }
+            }
+        };
+        if (props.additionalButtons) {
+            props.additionalButtons.push(localFilesButton);
+        }
+        else {
+            props.additionalButtons = [localFilesButton];
+        }
+    }
 };
 exports.RemoteElectronFileDialogService = RemoteElectronFileDialogService;
 tslib_1.__decorate([

package/lib/electron-browser/remote-electron-file-dialog-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-electron-file-dialog-service.js","sourceRoot":"","sources":["../../src/electron-browser/remote-electron-file-dialog-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAGhF,4DAAkE;AAGlE,uGAAyG;AACzG,kIAA4H;AAC5H,qDAAiD;AAG1C,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,wDAAyB;IAMjE,cAAc,CAAC,KAA0B,EAAE,MAAiB;QACjE,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;YACnC,OAAO,8CAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACvF,CAAC;aAAM,CAAC;YACJ,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAEQ,cAAc,CAAC,KAA0B,EAAE,MAA6B;QAC7E,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;YACnC,OAAO,8CAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACvF,CAAC;aAAM,CAAC;YACJ,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;CACJ,CAAA;AArBY,0EAA+B;AAEE;IAAzC,IAAA,kBAAM,EAAC,8BAAa,CAAC;sCAAmC,8BAAa;sEAAC;0CAF9D,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAqB3C"}
+{"version":3,"file":"remote-electron-file-dialog-service.js","sourceRoot":"","sources":["../../src/electron-browser/remote-electron-file-dialog-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,sCAAmD;AACnD,4DAAkE;AAGlE,uGAAyG;AACzG,kIAA4H;AAC5H,qDAAiD;AACjD,qEAA6D;AAGtD,IAAM,+BAA+B,GAArC,MAAM,+BAAgC,SAAQ,wDAAyB;IAMjE,cAAc,CAAC,KAA0B,EAAE,MAAiB;QACjE,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;YACnC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAChC,OAAO,8CAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACvF,CAAC;aAAM,CAAC;YACJ,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAEQ,cAAc,CAAC,KAA0B,EAAE,MAA6B;QAC7E,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;YACnC,OAAO,8CAAwB,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;QACvF,CAAC;aAAM,CAAC;YACJ,OAAO,KAAK,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;IAES,mBAAmB,CAAC,KAA0B;QACpD,MAAM,gBAAgB,GAA6C;YAC/D,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC;YAC1C,OAAO,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;gBACrB,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,cAAc,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,0CAAiB,EAAE,CAAC,CAAC;gBAC1F,IAAI,SAAS,EAAE,CAAC;oBACZ,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;gBAChC,CAAC;YACL,CAAC;SACJ,CAAC;QACF,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC1B,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACnD,CAAC;aAAM,CAAC;YACJ,KAAK,CAAC,iBAAiB,GAAG,CAAC,gBAAgB,CAAC,CAAC;QACjD,CAAC;IACL,CAAC;CACJ,CAAA;AAvCY,0EAA+B;AAEE;IAAzC,IAAA,kBAAM,EAAC,8BAAa,CAAC;sCAAmC,8BAAa;sEAAC;0CAF9D,+BAA+B;IAD3C,IAAA,sBAAU,GAAE;GACA,+BAA+B,CAuC3C"}

package/lib/electron-browser/remote-frontend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/remote-frontend-module.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAgB/D,OAAO,6DAA6D,CAAC;;AAOrE,wBA2CG"}
+{"version":3,"file":"remote-frontend-module.d.ts","sourceRoot":"","sources":["../../src/electron-browser/remote-frontend-module.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAgB/D,OAAO,6DAA6D,CAAC;;AAUrE,wBAmDG"}

package/lib/electron-browser/remote-frontend-module.js

@@ -38,6 +38,9 @@ const remote_user_storage_provider_1 = require("./remote-user-storage-provider")
 const remote_file_system_provider_1 = require("@theia/filesystem/lib/common/remote-file-system-provider");
 const local_backend_services_1 = require("./local-backend-services");
 const env_variables_1 = require("@theia/core/lib/common/env-variables");
+const browser_2 = require("@theia/workspace/lib/browser");
+const remote_local_workspace_contribution_1 = require("./remote-local-workspace-contribution");
+const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
 exports.default = new inversify_1.ContainerModule((bind, _, __, rebind) => {
     bind(remote_frontend_contribution_1.RemoteFrontendContribution).toSelf().inSingletonScope();
     bind(browser_1.FrontendApplicationContribution).toService(remote_frontend_contribution_1.RemoteFrontendContribution);
@@ -66,5 +69,12 @@ exports.default = new inversify_1.ContainerModule((bind, _, __, rebind) => {
         ctx.container.get(env_variables_1.EnvVariablesServer));
     bind(local_backend_services_1.LocalRemoteFileSystemProvider).toSelf().inSingletonScope();
     rebind(user_storage_contribution_1.UserStorageContribution).to(remote_user_storage_provider_1.RemoteUserStorageContribution);
+    if (browser_1.isRemote) {
+        bind(remote_local_workspace_contribution_1.RemoteLocalWorkspaceContribution).toSelf().inSingletonScope();
+        bind(browser_2.WorkspaceOpenHandlerContribution).toService(remote_local_workspace_contribution_1.RemoteLocalWorkspaceContribution);
+        bind(browser_2.WorkspaceHandlingContribution).toService(remote_local_workspace_contribution_1.RemoteLocalWorkspaceContribution);
+        bind(local_backend_services_1.LocalRemoteFileSystemContribution).toSelf().inSingletonScope();
+        bind(file_service_1.FileServiceContribution).toService(local_backend_services_1.LocalRemoteFileSystemContribution);
+    }
 });
 //# sourceMappingURL=remote-frontend-module.js.map

package/lib/electron-browser/remote-frontend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"remote-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/remote-frontend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,sCAAgF;AAChF,4DAA+D;AAC/D,qDAAyH;AACzH,uEAAkE;AAClE,sGAAiI;AACjI,iFAA4E;AAC5E,iFAA4E;AAC5E,qDAAiD;AACjD,oFAAwG;AACxG,kIAA4H;AAC5H,+FAAwF;AACxF,8EAA8E;AAC9E,qFAA2G;AAC3G,+FAA2F;AAC3F,uFAAkF;AAClF,wGAA0I;AAC1I,+GAA0G;AAC1G,uEAAqE;AACrE,wGAAmG;AACnG,iFAA+E;AAC/E,0GAAsJ;AACtJ,qEAA8H;AAC9H,wEAA4F;AAE5F,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE;IACvD,IAAI,CAAC,yDAA0B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,yDAA0B,CAAC,CAAC;IAC5E,IAAI,CAAC,0BAAmB,CAAC,CAAC,SAAS,CAAC,yDAA0B,CAAC,CAAC;IAEhE,IAAA,mCAA4B,EAAC,IAAI,EAAE,yDAA0B,CAAC,CAAC;IAC/D,IAAI,CAAC,+CAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,yDAA0B,CAAC,CAAC,SAAS,CAAC,+CAAqB,CAAC,CAAC;IAElE,IAAA,0CAAqB,EAAC,IAAI,CAAC,CAAC;IAE5B,MAAM,CAAC,wDAAyB,CAAC,CAAC,EAAE,CAAC,qEAA+B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEzF,IAAI,CAAC,8BAAa,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEhD,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,CAAC,uBAAa,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3C,EAAE,EAAE,kDAAyB;QAC7B,YAAY,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAuB,6CAAoB,CAAC;KACxF,CAAC,CAAC,CAAC;IAEJ,IAAA,8BAAoB,EAAC,IAAI,EAAE,wDAA0B,CAAC,CAAC;IACvD,IAAI,CAAC,+CAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAExD,IAAI,CAAC,4DAA2B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACnD,uDAAyB,CAAC,gBAAgB,CAA8B,GAAG,CAAC,SAAS,EAAE,gEAA+B,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAChJ,IAAI,CAAC,2CAAmB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAC3C,uDAAyB,CAAC,gBAAgB,CAAsB,GAAG,CAAC,SAAS,EAAE,+CAAuB,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEhI,IAAI,CAAC,8DAA4B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACpD,uDAAyB,CAAC,gBAAgB,CAA+B,GAAG,CAAC,SAAS,EAAE,wEAAsC,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAExJ,IAAI,CAAC,mDAA0B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAClD,kBAAQ,CAAC,CAAC;QACN,uDAAyB,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,EAAE,kDAAoB,EAAE,IAAI,0DAA4B,EAAE,CAAC,CAAC,CAAC;QACrH,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,oDAAsB,CAAC,CAAC,CAAC;IACnD,IAAI,CAAC,gDAAuB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAC/C,kBAAQ,CAAC,CAAC;QACN,uDAAyB,CAAC,gBAAgB,CAAqB,GAAG,CAAC,SAAS,EAAE,gCAAgB,CAAC,CAAC,CAAC;QACjG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,kCAAkB,CAAC,CAAC,CAAC;IAC/C,IAAI,CAAC,sDAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAChE,MAAM,CAAC,mDAAuB,CAAC,CAAC,EAAE,CAAC,4DAA6B,CAAC,CAAC;AAEtE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"remote-frontend-module.js","sourceRoot":"","sources":["../../src/electron-browser/remote-frontend-module.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/remote-local-workspace-contribution.d.ts

@@ -0,0 +1,18 @@
+import { ILogger, MaybePromise, URI } from '@theia/core';
+import { WorkspaceHandlingContribution, WorkspaceInput, WorkspaceOpenHandlerContribution } from '@theia/workspace/lib/browser';
+import { RemoteStatusService } from '../electron-common/remote-status-service';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { WorkspacePreferences } from '@theia/workspace/lib/common';
+export declare class RemoteLocalWorkspaceContribution implements WorkspaceOpenHandlerContribution, WorkspaceHandlingContribution {
+    protected readonly remoteStatusService: RemoteStatusService;
+    protected readonly windowService: WindowService;
+    protected logger: ILogger;
+    protected preferences: WorkspacePreferences;
+    canHandle(uri: URI): boolean;
+    modifyRecentWorkspaces(workspaces: string[]): Promise<string[]>;
+    openWorkspace(uri: URI, options?: WorkspaceInput | undefined): MaybePromise<void>;
+    protected reloadWindow(workspacePath: string): void;
+    protected openNewWindow(workspacePath: string): void;
+    protected getModifiedUrl(): URL;
+}
+//# sourceMappingURL=remote-local-workspace-contribution.d.ts.map

package/lib/electron-browser/remote-local-workspace-contribution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-local-workspace-contribution.d.ts","sourceRoot":"","sources":["../../src/electron-browser/remote-local-workspace-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEzD,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAG/H,OAAO,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,+CAA+C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,qBACa,gCAAiC,YAAW,gCAAgC,EAAE,6BAA6B;IAGpH,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAG1B,SAAS,CAAC,WAAW,EAAE,oBAAoB,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO;IAItB,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAWrE,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC;IAcjF,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAOnD,SAAS,CAAC,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAMpD,SAAS,CAAC,cAAc,IAAI,GAAG;CAMlC"}

package/lib/electron-browser/remote-local-workspace-contribution.js

@@ -0,0 +1,93 @@
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RemoteLocalWorkspaceContribution = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@theia/core");
+const inversify_1 = require("@theia/core/shared/inversify");
+const local_backend_services_1 = require("./local-backend-services");
+const electron_local_ws_connection_source_1 = require("@theia/core/lib/electron-browser/messaging/electron-local-ws-connection-source");
+const remote_status_service_1 = require("../electron-common/remote-status-service");
+const window_service_1 = require("@theia/core/lib/browser/window/window-service");
+const common_1 = require("@theia/workspace/lib/common");
+let RemoteLocalWorkspaceContribution = class RemoteLocalWorkspaceContribution {
+    canHandle(uri) {
+        return uri.scheme === local_backend_services_1.LOCAL_FILE_SCHEME;
+    }
+    async modifyRecentWorkspaces(workspaces) {
+        return workspaces.map(workspace => {
+            const uri = new core_1.URI(workspace);
+            if (uri.scheme === 'file') {
+                return uri.withScheme(local_backend_services_1.LOCAL_FILE_SCHEME).toString();
+            }
+            // possible check as well if a remote/dev-container workspace is from the connected remote and therefore change it to the 'file' scheme
+            return workspace;
+        });
+    }
+    openWorkspace(uri, options) {
+        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));
+            }
+        }
+    }
+    reloadWindow(workspacePath) {
+        const currentPort = (0, electron_local_ws_connection_source_1.getCurrentPort)();
+        this.remoteStatusService.connectionClosed(parseInt(currentPort ?? '0'));
+        const searchParams = this.getModifiedUrl().searchParams;
+        this.windowService.reload({ hash: encodeURI(workspacePath), search: Object.fromEntries(searchParams) });
+    }
+    openNewWindow(workspacePath) {
+        const url = this.getModifiedUrl();
+        url.hash = encodeURI(workspacePath);
+        this.windowService.openNewWindow(url.toString());
+    }
+    getModifiedUrl() {
+        const url = new URL(window.location.href);
+        url.searchParams.set(electron_local_ws_connection_source_1.CURRENT_PORT_PARAM, (0, electron_local_ws_connection_source_1.getLocalPort)() ?? '');
+        url.searchParams.delete(electron_local_ws_connection_source_1.LOCAL_PORT_PARAM);
+        return url;
+    }
+};
+exports.RemoteLocalWorkspaceContribution = RemoteLocalWorkspaceContribution;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(remote_status_service_1.RemoteStatusService),
+    tslib_1.__metadata("design:type", Object)
+], RemoteLocalWorkspaceContribution.prototype, "remoteStatusService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(window_service_1.WindowService),
+    tslib_1.__metadata("design:type", Object)
+], RemoteLocalWorkspaceContribution.prototype, "windowService", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.ILogger),
+    tslib_1.__metadata("design:type", Object)
+], RemoteLocalWorkspaceContribution.prototype, "logger", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(common_1.WorkspacePreferences),
+    tslib_1.__metadata("design:type", Object)
+], RemoteLocalWorkspaceContribution.prototype, "preferences", void 0);
+exports.RemoteLocalWorkspaceContribution = RemoteLocalWorkspaceContribution = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], RemoteLocalWorkspaceContribution);
+//# sourceMappingURL=remote-local-workspace-contribution.js.map

package/lib/electron-browser/remote-local-workspace-contribution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote-local-workspace-contribution.js","sourceRoot":"","sources":["../../src/electron-browser/remote-local-workspace-contribution.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@theia/remote",
-  "version": "1.70.0-next.7+a230181f5",
+  "version": "1.70.0-next.71+7ece9ea62",
   "description": "Theia - Remote",
   "dependencies": {
-    "@theia/core": "1.70.0-next.7+a230181f5",
-    "@theia/filesystem": "1.70.0-next.7+a230181f5",
-    "@theia/userstorage": "1.70.0-next.7+a230181f5",
-    "@theia/variable-resolver": "1.70.0-next.7+a230181f5",
+    "@theia/core": "1.70.0-next.71+7ece9ea62",
+    "@theia/filesystem": "1.70.0-next.71+7ece9ea62",
+    "@theia/userstorage": "1.70.0-next.71+7ece9ea62",
+    "@theia/variable-resolver": "1.70.0-next.71+7ece9ea62",
+    "@theia/workspace": "1.70.0-next.71+7ece9ea62",
     "archiver": "^5.3.1",
     "decompress": "^4.2.1",
     "decompress-tar": "^4.0.0",
@@ -16,7 +17,7 @@
     "glob": "^8.1.0",
     "socket.io": "^4.5.3",
     "socket.io-client": "^4.5.3",
-    "ssh-config": "^5.0.3",
+    "ssh-config": "~5.0.3",
     "ssh2": "^1.15.0",
     "ssh2-sftp-client": "^9.1.0",
     "tslib": "^2.6.2"
@@ -66,5 +67,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "a230181f5951eaba3fb82e11a14dc03dbff8feca"
+  "gitHead": "7ece9ea6295b73ee1ac962e29d416cebf578d380"
 }

package/src/electron-browser/local-backend-services.ts

@@ -14,13 +14,15 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { RpcProxy } from '@theia/core';
+import { RpcProxy, URI } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { RemoteFileSystemProvider, RemoteFileSystemServer } from '@theia/filesystem/lib/common/remote-file-system-provider';
+import { FileService, FileServiceContribution } from '@theia/filesystem/lib/browser/file-service';
 
 export const LocalEnvVariablesServer = Symbol('LocalEnviromentVariableServer');
 export const LocalRemoteFileSytemServer = Symbol('LocalRemoteFileSytemServer');
 
+export const LOCAL_FILE_SCHEME = 'localfile';
 /**
  * provide file access to local files while connected to a remote workspace or dev container.
  */
@@ -28,4 +30,38 @@ export const LocalRemoteFileSytemServer = Symbol('LocalRemoteFileSytemServer');
 export class LocalRemoteFileSystemProvider extends RemoteFileSystemProvider {
     @inject(LocalRemoteFileSytemServer)
     protected override readonly server: RpcProxy<RemoteFileSystemServer>;
+
+}
+
+@injectable()
+export class LocalRemoteFileSystemContribution implements FileServiceContribution {
+    @inject(LocalRemoteFileSystemProvider)
+    protected readonly provider: LocalRemoteFileSystemProvider;
+
+    registerFileSystemProviders(service: FileService): void {
+        service.onWillActivateFileSystemProvider(event => {
+            if (event.scheme === LOCAL_FILE_SCHEME) {
+                // This provider currently has limited functionality. It can not yet be used to react to listener events like onDidChangeFile
+                service.registerProvider(LOCAL_FILE_SCHEME, new Proxy(this.provider, {
+                    get(target, prop): unknown {
+                        const member = target[prop as keyof LocalRemoteFileSystemProvider];
+
+                        if (typeof member === 'function') {
+                            return (...args: unknown[]) => {
+                                const mappedArgs = args.map(arg => {
+                                    if (arg instanceof URI && arg.scheme === LOCAL_FILE_SCHEME) {
+                                        return arg.withScheme('file');
+                                    }
+                                    return arg;
+                                });
+                                return member.apply(target, mappedArgs);
+                            };
+                        }
+                        return member;
+                    }
+                }));
+            }
+        });
+    }
+
 }

package/src/electron-browser/remote-electron-file-dialog-service.ts

@@ -14,13 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { MaybeArray, URI } from '@theia/core';
+import { MaybeArray, URI, nls } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { OpenFileDialogProps, SaveFileDialogProps } from '@theia/filesystem/lib/browser/file-dialog';
+import { AdditionalButtonDefinition, OpenFileDialogProps, SaveFileDialogProps } from '@theia/filesystem/lib/browser/file-dialog';
 import { FileStat } from '@theia/filesystem/lib/common/files';
 import { DefaultFileDialogService } from '@theia/filesystem/lib/browser/file-dialog/file-dialog-service';
 import { ElectronFileDialogService } from '@theia/filesystem/lib/electron-browser/file-dialog/electron-file-dialog-service';
 import { RemoteService } from './remote-service';
+import { LOCAL_FILE_SCHEME } from './local-backend-services';
 
 @injectable()
 export class RemoteElectronFileDialogService extends ElectronFileDialogService {
@@ -31,6 +32,7 @@ export class RemoteElectronFileDialogService extends ElectronFileDialogService {
     override showOpenDialog(props: OpenFileDialogProps, folder?: FileStat | undefined): Promise<URI | undefined>;
     override showOpenDialog(props: OpenFileDialogProps, folder?: FileStat): Promise<MaybeArray<URI> | undefined> | Promise<URI | undefined> {
         if (this.remoteService.isConnected()) {
+            this.addLocalFilesButton(props);
             return DefaultFileDialogService.prototype.showOpenDialog.call(this, props, folder);
         } else {
             return super.showOpenDialog(props, folder);
@@ -44,4 +46,21 @@ export class RemoteElectronFileDialogService extends ElectronFileDialogService {
             return super.showSaveDialog(props, folder);
         }
     }
+
+    protected addLocalFilesButton(props: OpenFileDialogProps): void {
+        const localFilesButton: AdditionalButtonDefinition<{ uri: URI }> = {
+            label: nls.localizeByDefault('Show Local'),
+            onClick: async resolve => {
+                const localFile = await super.showOpenDialog({ ...props, fileScheme: LOCAL_FILE_SCHEME });
+                if (localFile) {
+                    resolve({ uri: localFile });
+                }
+            }
+        };
+        if (props.additionalButtons) {
+            props.additionalButtons.push(localFilesButton);
+        } else {
+            props.additionalButtons = [localFilesButton];
+        }
+    }
 }

package/src/electron-browser/remote-frontend-module.ts

@@ -35,8 +35,11 @@ import '../../src/electron-browser/style/port-forwarding-widget.css';
 import { UserStorageContribution } from '@theia/userstorage/lib/browser/user-storage-contribution';
 import { RemoteUserStorageContribution } from './remote-user-storage-provider';
 import { remoteFileSystemPath, RemoteFileSystemProxyFactory, RemoteFileSystemServer } from '@theia/filesystem/lib/common/remote-file-system-provider';
-import { LocalEnvVariablesServer, LocalRemoteFileSystemProvider, LocalRemoteFileSytemServer } from './local-backend-services';
+import { LocalEnvVariablesServer, LocalRemoteFileSystemContribution, LocalRemoteFileSystemProvider, LocalRemoteFileSytemServer } from './local-backend-services';
 import { envVariablesPath, EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+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) => {
     bind(RemoteFrontendContribution).toSelf().inSingletonScope();
@@ -81,4 +84,12 @@ export default new ContainerModule((bind, _, __, rebind) => {
     bind(LocalRemoteFileSystemProvider).toSelf().inSingletonScope();
     rebind(UserStorageContribution).to(RemoteUserStorageContribution);
 
+    if (isRemote) {
+        bind(RemoteLocalWorkspaceContribution).toSelf().inSingletonScope();
+        bind(WorkspaceOpenHandlerContribution).toService(RemoteLocalWorkspaceContribution);
+        bind(WorkspaceHandlingContribution).toService(RemoteLocalWorkspaceContribution);
+        bind(LocalRemoteFileSystemContribution).toSelf().inSingletonScope();
+        bind(FileServiceContribution).toService(LocalRemoteFileSystemContribution);
+    }
+
 });

package/src/electron-browser/remote-local-workspace-contribution.ts

@@ -0,0 +1,89 @@
+// *****************************************************************************
+// Copyright (C) 2024 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ILogger, MaybePromise, URI } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { WorkspaceHandlingContribution, WorkspaceInput, WorkspaceOpenHandlerContribution } 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';
+import { WorkspacePreferences } from '@theia/workspace/lib/common';
+
+@injectable()
+export class RemoteLocalWorkspaceContribution implements WorkspaceOpenHandlerContribution, WorkspaceHandlingContribution {
+
+    @inject(RemoteStatusService)
+    protected readonly remoteStatusService: RemoteStatusService;
+
+    @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;
+    }
+
+    async modifyRecentWorkspaces(workspaces: string[]): Promise<string[]> {
+        return workspaces.map(workspace => {
+            const uri = new URI(workspace);
+            if (uri.scheme === 'file') {
+                return uri.withScheme(LOCAL_FILE_SCHEME).toString();
+            }
+            // possible check as well if a remote/dev-container workspace is from the connected remote and therefore change it to the 'file' scheme
+            return workspace;
+        });
+    }
+
+    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();
+        this.remoteStatusService.connectionClosed(parseInt(currentPort ?? '0'));
+        const searchParams = this.getModifiedUrl().searchParams;
+        this.windowService.reload({ hash: encodeURI(workspacePath), search: Object.fromEntries(searchParams) });
+    }
+
+    protected openNewWindow(workspacePath: string): void {
+        const url = this.getModifiedUrl();
+        url.hash = encodeURI(workspacePath);
+        this.windowService.openNewWindow(url.toString());
+    }
+
+    protected getModifiedUrl(): URL {
+        const url = new URL(window.location.href);
+        url.searchParams.set(CURRENT_PORT_PARAM, getLocalPort() ?? '');
+        url.searchParams.delete(LOCAL_PORT_PARAM);
+        return url;
+    }
+}