npm - @theia/workspace - Versions diffs - 1.41.0 → 1.42.0 - Mend

@theia/workspace 1.41.0 → 1.42.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/lib/browser/workspace-frontend-contribution.d.ts CHANGED Viewed

@@ -53,16 +53,16 @@ export declare class WorkspaceFrontendContribution implements CommandContributio
      * This is the generic `Open` method. Opens files and directories too. Resolves to the opened URI.
      * Except when you are on either Windows or Linux `AND` running in electron. If so, it opens a file.
      */
-    protected doOpen(): Promise<URI | undefined>;
+    protected doOpen(): Promise<URI[] | undefined>;
     /**
-     * Opens a file after prompting the `Open File` dialog. Resolves to `undefined`, if
+     * Opens a set of files after prompting the `Open File` dialog. Resolves to `undefined`, if
      *  - the workspace root is not set,
      *  - the file to open does not exist, or
      *  - it was not a file, but a directory.
      *
-     * Otherwise, resolves to the URI of the file.
+     * Otherwise, resolves to the set of URIs of the files.
      */
-    protected doOpenFile(): Promise<URI | undefined>;
+    protected doOpenFile(): Promise<URI[] | undefined>;
     /**
      * Opens one or more folders after prompting the `Open Folder` dialog. Resolves to `undefined`, if
      *  - the user's selection is empty or contains only files.

package/lib/browser/workspace-frontend-contribution.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"workspace-frontend-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-frontend-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,cAAc,EAAa,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAE1J,OAAO,EACG,aAAa,EAAe,kBAAkB,EAAE,sBAAsB,EAC5E,+BAA+B,EAA6B,gBAAgB,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,EACpH,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAuB,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC9G,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAyB,MAAM,WAAW,CAAC;AAExE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,+DAA+D,CAAC;AAGzG,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,gEAAgE,CAAC;AAI/G,oBAAY,eAAe;IACvB;;OAEG;IACH,KAAK,UAAU;IACf;;OAEG;IACH,SAAS,cAAc;IACvB;;OAEG;IACH,MAAM,WAAW;CACpB;AACD,oBAAY,cAAc,GAAG,MAAM,OAAO,eAAe,CAAC;AAC1D,oBAAY,cAAc,GAAG,MAAM,OAAO,eAAe,CAAC;AAE1D,6EAA6E;AAC7E,eAAO,MAAM,cAAc,UAAuC,CAAC;AAEnE,qBACa,6BAA8B,YAAW,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,+BAA+B;IAExH,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACpD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC9C,SAAS,CAAC,QAAQ,CAAC,wBAAwB,EAAE,wBAAwB,CAAC;IACjE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,6BAA6B,CAAC;IACvE,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAE5F,SAAS,IAAI,IAAI;IAqCjB,SAAS,CAAC,QAAQ,CAAC,kCAAkC,uBAA8B;IACnF,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAUzC,SAAS,CAAC,YAAY,IAAI,IAAI;IAS9B,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IA4CjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAmD7C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IA8B1D;;;OAGG;cACa,MAAM,IAAI,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;~~IAsBlD~~;;;;;;;OAOG;cACa,UAAU,IAAI,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;~~IAkBtD~~;;;;;;;;OAQG;cACa,YAAY,IAAI,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;cAqBxC,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;cAkBxE,wBAAwB,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAWzE;;;OAGG;cACa,eAAe,IAAI,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;cAmB3C,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/C;;OAEG;cACa,eAAe,IAAI,OAAO,CAAC,OAAO,CAAC;IAkCnD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,IAAI,MAAM,GAAG,cAAc,GAAG,WAAW;IAInF,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,SAAS,CAAC,uBAAuB,IAAI,cAAc;IAInD,SAAS,CAAC,uBAAuB,IAAI,cAAc;IAInD,SAAS,CAAC,aAAa,IAAI,cAAc,GAAG,cAAc;IAO1D,SAAS,CAAC,6BAA6B,IAAI,qBAAqB;IAQhE,OAAO,CAAC,UAAU;IAIlB;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAI9B,UAAU,IAAI,gBAAgB,CAAC,OAAO,CAAC,GAAG,SAAS;CA0BtD;AAED,yBAAiB,6BAA6B,CAAC;IAE3C;;;;OAIG;IACI,MAAM,mBAAmB,EAAE,qBAGjC,CAAC;CACL"}
1	+ {"version":3,"file":"workspace-frontend-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-frontend-contribution.ts"],"names":[],"mappings":"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"}

package/lib/browser/workspace-frontend-contribution.js CHANGED Viewed

@@ -243,45 +243,69 @@ let WorkspaceFrontendContribution = class WorkspaceFrontendContribution {
             return this.doOpenFile();
         }
         const [rootStat] = await this.workspaceService.roots;
-        const destinationUri = await this.fileDialogService.showOpenDialog({
+        let selectedUris = await this.fileDialogService.showOpenDialog({
             title: workspace_commands_1.WorkspaceCommands.OPEN.dialogLabel,
             canSelectFolders: true,
-            canSelectFiles: true
+            canSelectFiles: true,
+            canSelectMany: true
         }, rootStat);
-        if (destinationUri && ((_a = this.getCurrentWorkspaceUri()) === null || _a === void 0 ? void 0 : _a.toString()) !== destinationUri.toString()) {
-            const destination = await this.fileService.resolve(destinationUri);
-            if (destination.isDirectory) {
-                this.workspaceService.open(destinationUri);
+        if (selectedUris) {
+            if (!Array.isArray(selectedUris)) {
+                selectedUris = [selectedUris];
             }
-            else {
-                await (0, browser_1.open)(this.openerService, destinationUri);
+            const folders = [];
+            //  Only open files then open all folders in a new workspace, as done with Electron see doOpenFolder.
+            for (const uri of selectedUris) {
+                const destination = await this.fileService.resolve(uri);
+                if (destination.isDirectory) {
+                    if (((_a = this.getCurrentWorkspaceUri()) === null || _a === void 0 ? void 0 : _a.toString()) !== uri.toString()) {
+                        folders.push(uri);
+                    }
+                }
+                else {
+                    await (0, browser_1.open)(this.openerService, uri);
+                }
             }
-            return destinationUri;
+            if (folders.length > 0) {
+                const openableURI = await this.getOpenableWorkspaceUri(folders);
+                if (openableURI && (!this.workspaceService.workspace || !openableURI.isEqual(this.workspaceService.workspace.resource))) {
+                    this.workspaceService.open(openableURI);
+                }
+            }
+            return selectedUris;
         }
         return undefined;
     }
     /**
-     * Opens a file after prompting the `Open File` dialog. Resolves to `undefined`, if
+     * Opens a set of files after prompting the `Open File` dialog. Resolves to `undefined`, if
      *  - the workspace root is not set,
      *  - the file to open does not exist, or
      *  - it was not a file, but a directory.
      *
-     * Otherwise, resolves to the URI of the file.
+     * Otherwise, resolves to the set of URIs of the files.
      */
     async doOpenFile() {
         const props = {
             title: workspace_commands_1.WorkspaceCommands.OPEN_FILE.dialogLabel,
             canSelectFolders: false,
-            canSelectFiles: true
+            canSelectFiles: true,
+            canSelectMany: true
         };
         const [rootStat] = await this.workspaceService.roots;
-        const destinationFileUri = await this.fileDialogService.showOpenDialog(props, rootStat);
-        if (destinationFileUri) {
-            const destinationFile = await this.fileService.resolve(destinationFileUri);
-            if (!destinationFile.isDirectory) {
-                await (0, browser_1.open)(this.openerService, destinationFileUri);
-                return destinationFileUri;
+        let selectedFilesUris = await this.fileDialogService.showOpenDialog(props, rootStat);
+        if (selectedFilesUris) {
+            if (!Array.isArray(selectedFilesUris)) {
+                selectedFilesUris = [selectedFilesUris];
             }
+            const result = [];
+            for (const uri of selectedFilesUris) {
+                const destination = await this.fileService.resolve(uri);
+                if (destination.isFile) {
+                    await (0, browser_1.open)(this.openerService, uri);
+                    result.push(uri);
+                }
+            }
+            return result;
         }
         return undefined;
     }
@@ -304,11 +328,11 @@ let WorkspaceFrontendContribution = class WorkspaceFrontendContribution {
         const [rootStat] = await this.workspaceService.roots;
         const targetFolders = await this.fileDialogService.showOpenDialog(props, rootStat);
         if (targetFolders) {
-            const openableURI = await this.getOpenableWorkspaceUri(targetFolders);
-            if (openableURI) {
-                if (!this.workspaceService.workspace || !openableURI.isEqual(this.workspaceService.workspace.resource)) {
-                    this.workspaceService.open(openableURI);
-                    return openableURI;
+            const openableUri = await this.getOpenableWorkspaceUri(targetFolders);
+            if (openableUri) {
+                if (!this.workspaceService.workspace || !openableUri.isEqual(this.workspaceService.workspace.resource)) {
+                    this.workspaceService.open(openableUri);
+                    return openableUri;
                 }
             }
             ;

package/lib/browser/workspace-frontend-contribution.js.map CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,12 +1,12 @@
 {
   "name": "@theia/workspace",
-  "version": "1.41.0",
+  "version": "1.42.0",
   "description": "Theia - Workspace Extension",
   "dependencies": {
-    "@theia/core": "1.41.0",
-    "@theia/filesystem": "1.41.0",
+    "@theia/core": "1.42.0",
+    "@theia/filesystem": "1.42.0",
     "@theia/monaco-editor-core": "1.72.3",
-    "@theia/variable-resolver": "1.41.0",
+    "@theia/variable-resolver": "1.42.0",
     "jsonc-parser": "^2.2.0",
     "valid-filename": "^2.0.1"
   },
@@ -44,10 +44,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.41.0"
+    "@theia/ext-scripts": "1.42.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "180103ad086fc0a5e4e5fc01b5fcb43f06019eb1"
+  "gitHead": "caf9429694cfefd1881c5559a82611b8860c5885"
 }

package/src/browser/workspace-frontend-contribution.ts CHANGED Viewed

@@ -262,50 +262,76 @@ export class WorkspaceFrontendContribution implements CommandContribution, Keybi
      * This is the generic `Open` method. Opens files and directories too. Resolves to the opened URI.
      * Except when you are on either Windows or Linux `AND` running in electron. If so, it opens a file.
      */
-    protected async doOpen(): Promise<URI | undefined> {
+    protected async doOpen(): Promise<URI[] | undefined> {
         if (!isOSX && this.isElectron()) {
             return this.doOpenFile();
         }
         const [rootStat] = await this.workspaceService.roots;
-        const destinationUri = await this.fileDialogService.showOpenDialog({
+        let selectedUris = await this.fileDialogService.showOpenDialog({
             title: WorkspaceCommands.OPEN.dialogLabel,
             canSelectFolders: true,
-            canSelectFiles: true
+            canSelectFiles: true,
+            canSelectMany: true
         }, rootStat);
-        if (destinationUri && this.getCurrentWorkspaceUri()?.toString() !== destinationUri.toString()) {
-            const destination = await this.fileService.resolve(destinationUri);
-            if (destination.isDirectory) {
-                this.workspaceService.open(destinationUri);
-            } else {
-                await open(this.openerService, destinationUri);
+        if (selectedUris) {
+            if (!Array.isArray(selectedUris)) {
+                selectedUris = [selectedUris];
+            }
+            const folders: URI[] = [];
+            //  Only open files then open all folders in a new workspace, as done with Electron see doOpenFolder.
+            for (const uri of selectedUris) {
+                const destination = await this.fileService.resolve(uri);
+                if (destination.isDirectory) {
+                    if (this.getCurrentWorkspaceUri()?.toString() !== uri.toString()) {
+                        folders.push(uri);
+                    }
+                } else {
+                    await open(this.openerService, uri);
+                }
             }
-            return destinationUri;
+            if (folders.length > 0) {
+                const openableURI = await this.getOpenableWorkspaceUri(folders);
+                if (openableURI && (!this.workspaceService.workspace || !openableURI.isEqual(this.workspaceService.workspace.resource))) {
+                    this.workspaceService.open(openableURI);
+                }
+            }
+            return selectedUris;
         }
         return undefined;
     }
     /**
-     * Opens a file after prompting the `Open File` dialog. Resolves to `undefined`, if
+     * Opens a set of files after prompting the `Open File` dialog. Resolves to `undefined`, if
      *  - the workspace root is not set,
      *  - the file to open does not exist, or
      *  - it was not a file, but a directory.
      *
-     * Otherwise, resolves to the URI of the file.
+     * Otherwise, resolves to the set of URIs of the files.
      */
-    protected async doOpenFile(): Promise<URI | undefined> {
+    protected async doOpenFile(): Promise<URI[] | undefined> {
         const props: OpenFileDialogProps = {
             title: WorkspaceCommands.OPEN_FILE.dialogLabel,
             canSelectFolders: false,
-            canSelectFiles: true
+            canSelectFiles: true,
+            canSelectMany: true
         };
         const [rootStat] = await this.workspaceService.roots;
-        const destinationFileUri = await this.fileDialogService.showOpenDialog(props, rootStat);
-        if (destinationFileUri) {
-            const destinationFile = await this.fileService.resolve(destinationFileUri);
-            if (!destinationFile.isDirectory) {
-                await open(this.openerService, destinationFileUri);
-                return destinationFileUri;
+        let selectedFilesUris: MaybeArray<URI> | undefined = await this.fileDialogService.showOpenDialog(props, rootStat);
+        if (selectedFilesUris) {
+            if (!Array.isArray(selectedFilesUris)) {
+                selectedFilesUris = [selectedFilesUris];
             }
+            const result = [];
+            for (const uri of selectedFilesUris) {
+                const destination = await this.fileService.resolve(uri);
+                if (destination.isFile) {
+                    await open(this.openerService, uri);
+                    result.push(uri);
+                }
+            }
+            return result;
         }
         return undefined;
     }
@@ -329,11 +355,11 @@ export class WorkspaceFrontendContribution implements CommandContribution, Keybi
         const [rootStat] = await this.workspaceService.roots;
         const targetFolders = await this.fileDialogService.showOpenDialog(props, rootStat);
         if (targetFolders) {
-            const openableURI = await this.getOpenableWorkspaceUri(targetFolders);
-            if (openableURI) {
-                if (!this.workspaceService.workspace || !openableURI.isEqual(this.workspaceService.workspace.resource)) {
-                    this.workspaceService.open(openableURI);
-                    return openableURI;
+            const openableUri = await this.getOpenableWorkspaceUri(targetFolders);
+            if (openableUri) {
+                if (!this.workspaceService.workspace || !openableUri.isEqual(this.workspaceService.workspace.resource)) {
+                    this.workspaceService.open(openableUri);
+                    return openableUri;
                 }
             };
         }