@codingame/monaco-vscode-host-service-override 13.1.7 → 14.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-host-service-override",
-  "version": "13.1.7",
+  "version": "14.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - host service-override",
   "keywords": [],
@@ -15,10 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "13.1.7",
-    "@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common": "13.1.7",
-    "@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common": "13.1.7",
-    "@codingame/monaco-vscode-api": "13.1.7"
+    "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.1",
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "14.0.1",
+    "@codingame/monaco-vscode-api": "14.0.1",
+    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "14.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/host/browser/browserHostService.js

@@ -8,9 +8,9 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { isFolderToOpen, isWorkspaceToOpen, isFileToOpen } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
 import { pathsToEditors, isResourceEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { whenEditorClosed } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
+import { whenEditorClosed } from '@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common/vscode/vs/workbench/browser/editor';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { Verbosity } from '@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-common/vscode/vs/platform/label/common/label';
+import { Verbosity } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/label/common/label';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ModifierKeyEmitter, onDidRegisterWindow, trackFocus, getActiveDocument, getWindowId, disposableWindowInterval, detectFullscreen, EventType, addDisposableListener, addDisposableThrottledListener } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { Disposable, DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -160,11 +160,15 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         const payload = this.preservePayload(false , options);
         const fileOpenables = [];
         const foldersToAdd = [];
+        const foldersToRemove = [];
         for (const openable of toOpen) {
             openable.label = openable.label || this.getRecentLabel(openable);
             if (isFolderToOpen(openable)) {
                 if (options?.addMode) {
-                    foldersToAdd.push(({ uri: openable.folderUri }));
+                    foldersToAdd.push({ uri: openable.folderUri });
+                }
+                else if (options?.removeMode) {
+                    foldersToRemove.push(openable.folderUri);
                 }
                 else {
                     this.doOpen({ folderUri: openable.folderUri }, { reuse: this.shouldReuse(options, false ), payload });
@@ -177,10 +181,15 @@ let BrowserHostService = class BrowserHostService extends Disposable {
                 fileOpenables.push(openable);
             }
         }
-        if (foldersToAdd.length > 0) {
-            this.withServices(accessor => {
+        if (foldersToAdd.length > 0 || foldersToRemove.length > 0) {
+            this.withServices(async (accessor) => {
                 const workspaceEditingService = accessor.get(IWorkspaceEditingService);
-                workspaceEditingService.addFolders(foldersToAdd);
+                if (foldersToAdd.length > 0) {
+                    await workspaceEditingService.addFolders(foldersToAdd);
+                }
+                if (foldersToRemove.length > 0) {
+                    await workspaceEditingService.removeFolders(foldersToRemove);
+                }
             });
         }
         if (fileOpenables.length > 0) {
@@ -295,7 +304,7 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         if (isWorkspaceToOpen(openable)) {
             return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: Verbosity.LONG });
         }
-        return this.labelService.getUriLabel(openable.fileUri);
+        return this.labelService.getUriLabel(openable.fileUri, { appendWorkspaceSuffix: true });
     }
     shouldReuse(options = Object.create(null), isFile) {
         if (options.waitMarkerFileURI) {
@@ -331,10 +340,10 @@ let BrowserHostService = class BrowserHostService extends Disposable {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity.Warning,
                 message: ( localize(
-                    11603,
+                    11820,
                     "The browser interrupted the opening of a new tab or window. Press 'Open' to open it anyway."
                 )),
-                primaryButton: ( localize(11604, "&&Open"))
+                primaryButton: ( localize(11821, "&&Open"))
             });
             if (confirmed) {
                 await this.workspaceProvider.open(workspace, options);