@codingame/monaco-vscode-dialogs-service-override 29.1.1 → 30.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "29.1.1",
+  "version": "30.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - dialogs service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "29.1.1"
+    "@codingame/monaco-vscode-api": "30.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/services/dialogs/browser/abstractFileDialogService.js

@@ -202,16 +202,16 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             return ConfirmResult.DONT_SAVE;
         }
         let message;
-        let detail = ( localize(15840, "Your changes will be lost if you don't save them."));
+        let detail = ( localize(15926, "Your changes will be lost if you don't save them."));
         if (fileNamesOrResources.length === 1) {
             message = ( localize(
-                15841,
+                15927,
                 "Do you want to save the changes you made to {0}?",
                 typeof fileNamesOrResources[0] === "string" ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
         } else {
             message = ( localize(
-                15842,
+                15928,
                 "Do you want to save the changes to the following {0} files?",
                 fileNamesOrResources.length
             ));
@@ -224,10 +224,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             message,
             detail,
             buttons: [{
-                label: fileNamesOrResources.length > 1 ? ( localize(15843, "&&Save All")) : ( localize(15844, "&&Save")),
+                label: fileNamesOrResources.length > 1 ? ( localize(15929, "&&Save All")) : ( localize(15930, "&&Save")),
                 run: () => ConfirmResult.SAVE
             }, {
-                label: ( localize(15845, "Do&&n't Save")),
+                label: ( localize(15931, "Do&&n't Save")),
                 run: () => ConfirmResult.DONT_SAVE
             }],
             cancelButton: {
@@ -240,7 +240,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         return schema === Schemas.untitled ? [Schemas.file] : (schema !== Schemas.file ? [schema, Schemas.file] : [schema]);
     }
     async pickFileFolderAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(15846, "Open File or Folder"));
+        const title = ( localize(15932, "Open File or Folder"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uris = await this.pickResource({
             canSelectFiles: true,
@@ -280,7 +280,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(15847, "Open File"));
+        const title = ( localize(15933, "Open File"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uris = await this.pickResource({
             canSelectFiles: true,
@@ -322,7 +322,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( localize(15848, "Open Folder"));
+        const title = ( localize(15934, "Open Folder"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
         const uris = await this.pickResource({
             canSelectFiles: false,
@@ -343,9 +343,9 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( localize(15849, "Open Workspace from File"));
+        const title = ( localize(15935, "Open Workspace from File"));
         const filters = [{
-            name: ( localize(15850, "Workspace")),
+            name: ( localize(15936, "Workspace")),
             extensions: [WORKSPACE_EXTENSION]
         }];
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
@@ -372,7 +372,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( localize(15851, "Save As"));
+        options.title = ( localize(15937, "Save As"));
         const uri = await this.saveRemoteResource(options);
         if (uri) {
             this.addFileToRecentlyOpened(uri);
@@ -437,7 +437,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( localize(15852, "Save As")),
+            title: ( localize(15938, "Save As")),
             availableFileSystems
         };
         const ext = defaultUri ? extname(defaultUri) : undefined;
@@ -475,10 +475,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             };
         }
         options.filters = coalesce([{
-            name: ( localize(15853, "All Files")),
+            name: ( localize(15939, "All Files")),
             extensions: ["*"]
         }, matchingFilter, ...registeredLanguageFilters, {
-            name: ( localize(15854, "No Extension")),
+            name: ( localize(15940, "No Extension")),
             extensions: [""]
         }]);
         return options;

package/vscode/src/vs/workbench/services/dialogs/browser/fileDialogService.js

@@ -28,7 +28,7 @@ class FileDialogService extends AbstractFileDialogService {
         if (this.shouldUseSimplified(schema)) {
             return super.pickFileFolderAndOpenSimplified(schema, options, false);
         }
-        throw ( new Error(( localize(15855, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(15941, "Can't open folders, try adding a folder to the workspace instead."))));
     }
     addFileSchemaIfNeeded(schema, isFolder) {
         return (schema === Schemas.untitled) ? [Schemas.file] : (((schema !== Schemas.file) && (!isFolder || (schema !== Schemas.vscodeRemote))) ? [schema, Schemas.file] : [schema]);
@@ -73,7 +73,7 @@ class FileDialogService extends AbstractFileDialogService {
         if (this.shouldUseSimplified(schema)) {
             return super.pickFolderAndOpenSimplified(schema, options);
         }
-        throw ( new Error(( localize(15855, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(15941, "Can't open folders, try adding a folder to the workspace instead."))));
     }
     async pickWorkspaceAndOpen(options) {
         options.availableFileSystems = this.getWorkspaceAvailableFileSystems(options);
@@ -85,7 +85,7 @@ class FileDialogService extends AbstractFileDialogService {
             return super.pickWorkspaceAndOpenSimplified(schema, options);
         }
         throw ( new Error(( localize(
-            15856,
+            15942,
             "Can't open workspaces, try adding a folder to the workspace instead."
         ))));
     }
@@ -213,19 +213,19 @@ class FileDialogService extends AbstractFileDialogService {
             }
         }
         const buttons = [{
-            label: ( localize(15857, "&&Open Remote...")),
+            label: ( localize(15943, "&&Open Remote...")),
             run: async () => {
                 await this.commandService.executeCommand("workbench.action.remote.showMenu");
             }
         }, {
-            label: ( localize(15858, "&&Learn More")),
+            label: ( localize(15944, "&&Learn More")),
             run: async () => {
                 await this.openerService.open("https://aka.ms/VSCodeWebLocalFileSystemAccess");
             }
         }];
         if (context === "open") {
             buttons.push({
-                label: ( localize(15859, "Open &&Files...")),
+                label: ( localize(15945, "Open &&Files...")),
                 run: async () => {
                     const files = await triggerUpload();
                     if (files) {
@@ -247,9 +247,9 @@ class FileDialogService extends AbstractFileDialogService {
         }
         await this.dialogService.prompt({
             type: Severity.Warning,
-            message: ( localize(15860, "Opening Local Folders is Unsupported")),
+            message: ( localize(15946, "Opening Local Folders is Unsupported")),
             detail: ( localize(
-                15861,
+                15947,
                 "Your browser doesn't support opening local folders.\nYou can either open single files or open a remote repository."
             )),
             buttons

package/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.d.ts

@@ -85,6 +85,15 @@ export declare class SimpleFileDialog extends Disposable implements ISimpleFileD
      * {@link remoteAuthority}).
      */
     private scopedAuthority;
+    /**
+     * Path prefix that the label formatter strips from URIs in the
+     * scoped scheme (e.g. `/file/-` for agent host URIs that encode
+     * the original scheme and authority as leading path segments).
+     *
+     * Stripped by {@link pathFromUri} and re-applied by
+     * {@link remoteUriFrom} so the user sees clean paths.
+     */
+    private scopedPathPrefix;
     private readonly onBusyChangeEmitter;
     private updatingPromise;
     private _showDotFiles;
@@ -107,6 +116,15 @@ export declare class SimpleFileDialog extends Disposable implements ISimpleFileD
      * already handled by the existing logic.
      */
     private getScopedAuthority;
+    /**
+     * Computes the path prefix that the label formatter strips for the
+     * scoped scheme, by comparing the raw URI path with the label
+     * service's formatted output.
+     *
+     * For example, an agent host URI with path `/file/-/Users/roblou`
+     * formats as `/Users/roblou`, so the prefix is `/file/-`.
+     */
+    private computeScopedPathPrefix;
     private getRemoteAgentEnvironment;
     protected getUserHome(trueHome?: boolean): Promise<URI>;
     private normalizeUri;

package/vscode/src/vs/workbench/services/dialogs/browser/simpleFileDialog.js

@@ -41,7 +41,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 var OpenLocalFileCommand;
 (function(OpenLocalFileCommand) {
     OpenLocalFileCommand.ID = "workbench.action.files.openLocalFile";
-    OpenLocalFileCommand.LABEL = ( localize(15862, "Open Local File..."));
+    OpenLocalFileCommand.LABEL = ( localize(15948, "Open Local File..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -56,7 +56,7 @@ var OpenLocalFileCommand;
 var SaveLocalFileCommand;
 (function(SaveLocalFileCommand) {
     SaveLocalFileCommand.ID = "workbench.action.files.saveLocalFile";
-    SaveLocalFileCommand.LABEL = ( localize(15863, "Save Local File..."));
+    SaveLocalFileCommand.LABEL = ( localize(15949, "Save Local File..."));
     function handler() {
         return accessor => {
             const editorService = accessor.get(IEditorService);
@@ -79,7 +79,7 @@ var SaveLocalFileCommand;
 var OpenLocalFolderCommand;
 (function(OpenLocalFolderCommand) {
     OpenLocalFolderCommand.ID = "workbench.action.files.openLocalFolder";
-    OpenLocalFolderCommand.LABEL = ( localize(15864, "Open Local Folder..."));
+    OpenLocalFolderCommand.LABEL = ( localize(15950, "Open Local Folder..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -94,7 +94,7 @@ var OpenLocalFolderCommand;
 var OpenLocalFileFolderCommand;
 (function(OpenLocalFileFolderCommand) {
     OpenLocalFileFolderCommand.ID = "workbench.action.files.openLocalFileFolder";
-    OpenLocalFileFolderCommand.LABEL = ( localize(15865, "Open Local..."));
+    OpenLocalFileFolderCommand.LABEL = ( localize(15951, "Open Local..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -156,6 +156,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         this.autoCompletePathSegment = "";
         this.isWindows = false;
         this.separator = "/";
+        this.scopedPathPrefix = "";
         this.onBusyChangeEmitter = this._register(( new Emitter()));
         this._showDotFiles = true;
         this.remoteAuthority = this.environmentService.remoteAuthority;
@@ -198,6 +199,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     async showOpenDialog(options = {}) {
         this.scheme = this.getScheme(options.availableFileSystems, options.defaultUri);
         this.scopedAuthority = this.getScopedAuthority(options.defaultUri);
+        this.scopedPathPrefix = options.defaultUri && this.scopedAuthority ? this.computeScopedPathPrefix(options.defaultUri) : "";
         this.userHome = await this.getUserHome();
         this.trueHome = await this.getUserHome(true);
         const newOptions = this.getOptions(options);
@@ -214,6 +216,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     async showSaveDialog(options) {
         this.scheme = this.getScheme(options.availableFileSystems, options.defaultUri);
         this.scopedAuthority = this.getScopedAuthority(options.defaultUri);
+        this.scopedPathPrefix = options.defaultUri && this.scopedAuthority ? this.computeScopedPathPrefix(options.defaultUri) : "";
         this.userHome = await this.getUserHome();
         this.trueHome = await this.getUserHome(true);
         this.requiresTrailing = true;
@@ -245,7 +248,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         if ((this.scheme !== Schemas.file) && !this.fileService.hasProvider(defaultUri)) {
             this.notificationService.info(( localize(
-                15866,
+                15952,
                 "File system provider for {0} is not available.",
                 (defaultUri.toString())
             )));
@@ -263,7 +266,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
             return ( URI.from({
                 scheme: this.scheme,
                 authority: this.scopedAuthority,
-                path,
+                path: this.scopedPathPrefix + path,
                 query: hintUri?.query,
                 fragment: hintUri?.fragment
             }));
@@ -298,6 +301,14 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         return undefined;
     }
+    computeScopedPathPrefix(uri) {
+        const fullPath = uri.path;
+        const displayPath = this.labelService.getUriLabel(uri);
+        if (displayPath && fullPath.endsWith(displayPath)) {
+            return fullPath.substring(0, fullPath.length - displayPath.length);
+        }
+        return "";
+    }
     async getRemoteAgentEnvironment() {
         if (this.remoteAgentEnvironment === undefined) {
             this.remoteAgentEnvironment = await this.remoteAgentService.getEnvironment();
@@ -309,7 +320,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
             return Promise.resolve(( URI.from({
                 scheme: this.scheme,
                 authority: this.scopedAuthority,
-                path: "/"
+                path: this.scopedPathPrefix + "/"
             })));
         }
         return trueHome ? this.pathService.userHome({
@@ -345,12 +356,12 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
             this.filePickBox.matchOnLabel = false;
             this.filePickBox.sortByLabel = false;
             this.filePickBox.ignoreFocusOut = true;
-            this.filePickBox.placeholder = ( localize(15867, "Folder path"));
+            this.filePickBox.placeholder = ( localize(15953, "Folder path"));
             this.filePickBox.ok = true;
             this.filePickBox.okLabel = typeof this.options.openLabel === "string" ? this.options.openLabel : this.options.openLabel?.withoutMnemonic;
             if ((this.scheme !== Schemas.file) && this.options && this.options.availableFileSystems && (this.options.availableFileSystems.length > 1) && (this.options.availableFileSystems.indexOf(Schemas.file) > -1)) {
                 this.filePickBox.customButton = true;
-                this.filePickBox.customLabel = ( localize(15868, "Show Local"));
+                this.filePickBox.customLabel = ( localize(15954, "Show Local"));
                 this.filePickBox.customButtonSecondary = true;
                 let action;
                 if (isSave) {
@@ -501,7 +512,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     setButtons() {
         this.filePickBox.buttons = [{
             iconClass: this._showDotFiles ? ThemeIcon.asClassName(Codicon.eye) : ThemeIcon.asClassName(Codicon.eyeClosed),
-            tooltip: this._showDotFiles ? ( localize(15869, "Hide dot files")) : ( localize(15870, "Show dot files")),
+            tooltip: this._showDotFiles ? ( localize(15955, "Hide dot files")) : ( localize(15956, "Show dot files")),
             alwaysVisible: true
         }];
     }
@@ -656,7 +667,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
                     valueUri = this.tryAddTrailingSeparatorToDirectory(valueUri, stat);
                     return (await this.updateItems(valueUri)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
                 } else if (this.endsWithSlash(value)) {
-                    this.filePickBox.validationMessage = ( localize(15871, "The path does not exist. Use ~ to go to your home directory."));
+                    this.filePickBox.validationMessage = ( localize(15957, "The path does not exist. Use ~ to go to your home directory."));
                     this.badPath = value;
                     return UpdateResult.InvalidPath;
                 } else {
@@ -820,7 +831,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         prompt.ignoreFocusOut = true;
         prompt.ok = true;
         prompt.customButton = true;
-        prompt.customLabel = ( localize(15872, "Cancel"));
+        prompt.customLabel = ( localize(15958, "Cancel"));
         prompt.customButtonSecondary = true;
         prompt.value = this.pathFromUri(uri);
         let isResolving = false;
@@ -849,7 +860,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     }
     async validate(uri) {
         if (uri === undefined) {
-            this.filePickBox.validationMessage = ( localize(15873, "Please enter a valid path."));
+            this.filePickBox.validationMessage = ( localize(15959, "Please enter a valid path."));
             return Promise.resolve(false);
         }
         let stat;
@@ -860,47 +871,47 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         } catch (e) {}
         if (this.requiresTrailing) {
             if (stat?.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(15874, "The folder already exists. Please use a new file name."));
+                this.filePickBox.validationMessage = ( localize(15960, "The folder already exists. Please use a new file name."));
                 return Promise.resolve(false);
             } else if (stat) {
                 const message = ( localize(
-                    15875,
+                    15961,
                     "{0} already exists. Are you sure you want to overwrite it?",
                     basename(uri)
                 ));
                 return this.yesNoPrompt(uri, message);
             } else if (!(isValidBasename(basename(uri), this.isWindows))) {
-                this.filePickBox.validationMessage = ( localize(15876, "Please enter a valid file name."));
+                this.filePickBox.validationMessage = ( localize(15962, "Please enter a valid file name."));
                 return Promise.resolve(false);
             } else if (!statDirname) {
                 const message = ( localize(
-                    15877,
+                    15963,
                     "The folder {0} does not exist. Would you like to create it?",
                     basename(dirname(uri))
                 ));
                 return this.yesNoPrompt(uri, message);
             } else if (!statDirname.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(15878, "Please enter a path that exists."));
+                this.filePickBox.validationMessage = ( localize(15964, "Please enter a path that exists."));
                 return Promise.resolve(false);
             } else if (statDirname.readonly) {
                 this.filePickBox.validationMessage = ( localize(
-                    15879,
+                    15965,
                     "This folder cannot be used as a save destination. Please choose another folder"
                 ));
                 return Promise.resolve(false);
             }
         } else {
             if (!stat) {
-                this.filePickBox.validationMessage = ( localize(15878, "Please enter a path that exists."));
+                this.filePickBox.validationMessage = ( localize(15964, "Please enter a path that exists."));
                 return Promise.resolve(false);
             } else if (uri.path === "/" && this.isWindows) {
-                this.filePickBox.validationMessage = ( localize(15880, "Please start the path with a drive letter."));
+                this.filePickBox.validationMessage = ( localize(15966, "Please start the path with a drive letter."));
                 return Promise.resolve(false);
             } else if (stat.isDirectory && !this.allowFolderSelection) {
-                this.filePickBox.validationMessage = ( localize(15881, "Please select a file."));
+                this.filePickBox.validationMessage = ( localize(15967, "Please select a file."));
                 return Promise.resolve(false);
             } else if (!stat.isDirectory && !this.allowFileSelection) {
-                this.filePickBox.validationMessage = ( localize(15882, "Please select a folder."));
+                this.filePickBox.validationMessage = ( localize(15968, "Please select a folder."));
                 return Promise.resolve(false);
             }
         }
@@ -960,7 +971,11 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     pathFromUri(uri, endWithSeparator = false) {
         let result;
         if (this.scopedAuthority) {
-            result = uri.path.replace(/\n/g, "");
+            let path = uri.path;
+            if (this.scopedPathPrefix && path.startsWith(this.scopedPathPrefix)) {
+                path = path.substring(this.scopedPathPrefix.length);
+            }
+            result = path.replace(/\n/g, "");
         } else {
             result = normalizeDriveLetter(uri.fsPath, this.isWindows).replace(/\n/g, "");
         }
@@ -999,6 +1014,12 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         return child.substring(parent.length);
     }
     async createBackItem(currFolder) {
+        if (this.scopedPathPrefix) {
+            const pathAfterPrefix = currFolder.path.substring(this.scopedPathPrefix.length);
+            if (pathAfterPrefix === "/" || pathAfterPrefix === "") {
+                return undefined;
+            }
+        }
         const compareScheme = this.scopedAuthority ? this.scheme : Schemas.file;
         const compareAuthority = this.scopedAuthority ?? "";
         const fileRepresentationCurr = this.currentFolder.with({