@codingame/monaco-vscode-dialogs-service-override 27.0.0 → 28.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "27.0.0",
+  "version": "28.0.1",
   "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": "27.0.0"
+    "@codingame/monaco-vscode-api": "28.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.js

@@ -64,7 +64,8 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
             prompt.cancelButton ? buttons.length - 1 : -1,
             prompt.checkbox,
             undefined,
-            typeof prompt?.custom === "object" ? prompt.custom : undefined
+            typeof prompt?.custom === "object" ? prompt.custom : undefined,
+            prompt.token
         );
         return this.getPromptResult(prompt, button, checkboxChecked);
     }
@@ -82,7 +83,8 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
             buttons.length - 1,
             confirmation.checkbox,
             undefined,
-            typeof confirmation?.custom === "object" ? confirmation.custom : undefined
+            typeof confirmation?.custom === "object" ? confirmation.custom : undefined,
+            confirmation.token
         );
         return {
             confirmed: button === 0,
@@ -104,7 +106,8 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
             buttons.length - 1,
             input?.checkbox,
             input.inputs,
-            typeof input.custom === "object" ? input.custom : undefined
+            typeof input.custom === "object" ? input.custom : undefined,
+            input.token
         );
         return {
             confirmed: button === 0,
@@ -115,12 +118,22 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
     async about(title, details, detailsToCopy) {
         const {
             button
-        } = await this.doShow(Severity.Info, title, [( localize(3095, "&&Copy")), ( localize(3096, "OK"))], details, 1);
+        } = await this.doShow(Severity.Info, title, [( localize(3099, "&&Copy")), ( localize(3100, "OK"))], details, 1);
         if (button === 0) {
             this.clipboardService.writeText(detailsToCopy);
         }
     }
-    async doShow(type, message, buttons, detail, cancelId, checkbox, inputs, customOptions) {
+    async doShow(
+        type,
+        message,
+        buttons,
+        detail,
+        cancelId,
+        checkbox,
+        inputs,
+        customOptions,
+        token
+    ) {
         const dialogDisposables = ( new DisposableStore());
         const renderBody = customOptions ? parent => {
             parent.classList.add(...(customOptions.classes || []));
@@ -159,6 +172,9 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
             }, this.keybindingService, this.layoutService, this.hostService, BrowserDialogHandler_1.ALLOWABLE_COMMANDS)
         ));
         dialogDisposables.add(dialog);
+        if (token) {
+            dialogDisposables.add(token.onCancellationRequested(() => dialogDisposables.dispose()));
+        }
         const result = await dialog.show();
         dialogDisposables.dispose();
         return result;

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(15346, "Your changes will be lost if you don't save them."));
+        let detail = ( localize(15544, "Your changes will be lost if you don't save them."));
         if (fileNamesOrResources.length === 1) {
             message = ( localize(
-                15347,
+                15545,
                 "Do you want to save the changes you made to {0}?",
                 typeof fileNamesOrResources[0] === "string" ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
         } else {
             message = ( localize(
-                15348,
+                15546,
                 "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(15349, "&&Save All")) : ( localize(15350, "&&Save")),
+                label: fileNamesOrResources.length > 1 ? ( localize(15547, "&&Save All")) : ( localize(15548, "&&Save")),
                 run: () => ConfirmResult.SAVE
             }, {
-                label: ( localize(15351, "Do&&n't Save")),
+                label: ( localize(15549, "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(15352, "Open File or Folder"));
+        const title = ( localize(15550, "Open File or Folder"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({
             canSelectFiles: true,
@@ -279,7 +279,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(15353, "Open File"));
+        const title = ( localize(15551, "Open File"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({
             canSelectFiles: true,
@@ -320,7 +320,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( localize(15354, "Open Folder"));
+        const title = ( localize(15552, "Open Folder"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
         const uri = await this.pickResource({
             canSelectFiles: false,
@@ -340,9 +340,9 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( localize(15355, "Open Workspace from File"));
+        const title = ( localize(15553, "Open Workspace from File"));
         const filters = [{
-            name: ( localize(15356, "Workspace")),
+            name: ( localize(15554, "Workspace")),
             extensions: [WORKSPACE_EXTENSION]
         }];
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
@@ -368,7 +368,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( localize(15357, "Save As"));
+        options.title = ( localize(15555, "Save As"));
         const uri = await this.saveRemoteResource(options);
         if (uri) {
             this.addFileToRecentlyOpened(uri);
@@ -434,7 +434,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( localize(15358, "Save As")),
+            title: ( localize(15556, "Save As")),
             availableFileSystems
         };
         const ext = defaultUri ? extname(defaultUri) : undefined;
@@ -472,10 +472,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             };
         }
         options.filters = coalesce([{
-            name: ( localize(15359, "All Files")),
+            name: ( localize(15557, "All Files")),
             extensions: ["*"]
         }, matchingFilter, ...registeredLanguageFilters, {
-            name: ( localize(15360, "No Extension")),
+            name: ( localize(15558, "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(15361, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(15559, "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(15361, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(15559, "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(
-            15362,
+            15560,
             "Can't open workspaces, try adding a folder to the workspace instead."
         ))));
     }
@@ -213,19 +213,19 @@ class FileDialogService extends AbstractFileDialogService {
             }
         }
         const buttons = [{
-            label: ( localize(15363, "&&Open Remote...")),
+            label: ( localize(15561, "&&Open Remote...")),
             run: async () => {
                 await this.commandService.executeCommand("workbench.action.remote.showMenu");
             }
         }, {
-            label: ( localize(15364, "&&Learn More")),
+            label: ( localize(15562, "&&Learn More")),
             run: async () => {
                 await this.openerService.open("https://aka.ms/VSCodeWebLocalFileSystemAccess");
             }
         }];
         if (context === "open") {
             buttons.push({
-                label: ( localize(15365, "Open &&Files...")),
+                label: ( localize(15563, "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(15366, "Opening Local Folders is Unsupported")),
+            message: ( localize(15564, "Opening Local Folders is Unsupported")),
             detail: ( localize(
-                15367,
+                15565,
                 "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.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(15368, "Open Local File..."));
+    OpenLocalFileCommand.LABEL = ( localize(15566, "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(15369, "Save Local File..."));
+    SaveLocalFileCommand.LABEL = ( localize(15567, "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(15370, "Open Local Folder..."));
+    OpenLocalFolderCommand.LABEL = ( localize(15568, "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(15371, "Open Local..."));
+    OpenLocalFileFolderCommand.LABEL = ( localize(15569, "Open Local..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -239,7 +239,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         if ((this.scheme !== Schemas.file) && !this.fileService.hasProvider(defaultUri)) {
             this.notificationService.info(( localize(
-                15372,
+                15570,
                 "File system provider for {0} is not available.",
                 (defaultUri.toString())
             )));
@@ -312,12 +312,12 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
             this.filePickBox.matchOnLabel = false;
             this.filePickBox.sortByLabel = false;
             this.filePickBox.ignoreFocusOut = true;
-            this.filePickBox.placeholder = ( localize(15373, "Folder path"));
+            this.filePickBox.placeholder = ( localize(15571, "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(15374, "Show Local"));
+                this.filePickBox.customLabel = ( localize(15572, "Show Local"));
                 this.filePickBox.customButtonSecondary = true;
                 let action;
                 if (isSave) {
@@ -465,7 +465,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(15375, "Hide dot files")) : ( localize(15376, "Show dot files")),
+            tooltip: this._showDotFiles ? ( localize(15573, "Hide dot files")) : ( localize(15574, "Show dot files")),
             alwaysVisible: true
         }];
     }
@@ -620,7 +620,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(15377, "The path does not exist. Use ~ to go to your home directory."));
+                    this.filePickBox.validationMessage = ( localize(15575, "The path does not exist. Use ~ to go to your home directory."));
                     this.badPath = value;
                     return UpdateResult.InvalidPath;
                 } else {
@@ -784,7 +784,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         prompt.ignoreFocusOut = true;
         prompt.ok = true;
         prompt.customButton = true;
-        prompt.customLabel = ( localize(15378, "Cancel"));
+        prompt.customLabel = ( localize(15576, "Cancel"));
         prompt.customButtonSecondary = true;
         prompt.value = this.pathFromUri(uri);
         let isResolving = false;
@@ -813,7 +813,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     }
     async validate(uri) {
         if (uri === undefined) {
-            this.filePickBox.validationMessage = ( localize(15379, "Please enter a valid path."));
+            this.filePickBox.validationMessage = ( localize(15577, "Please enter a valid path."));
             return Promise.resolve(false);
         }
         let stat;
@@ -824,47 +824,47 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         } catch (e) {}
         if (this.requiresTrailing) {
             if (stat?.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(15380, "The folder already exists. Please use a new file name."));
+                this.filePickBox.validationMessage = ( localize(15578, "The folder already exists. Please use a new file name."));
                 return Promise.resolve(false);
             } else if (stat) {
                 const message = ( localize(
-                    15381,
+                    15579,
                     "{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(15382, "Please enter a valid file name."));
+                this.filePickBox.validationMessage = ( localize(15580, "Please enter a valid file name."));
                 return Promise.resolve(false);
             } else if (!statDirname) {
                 const message = ( localize(
-                    15383,
+                    15581,
                     "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(15384, "Please enter a path that exists."));
+                this.filePickBox.validationMessage = ( localize(15582, "Please enter a path that exists."));
                 return Promise.resolve(false);
             } else if (statDirname.readonly) {
                 this.filePickBox.validationMessage = ( localize(
-                    15385,
+                    15583,
                     "This folder cannot be used as a save destination. Please choose another folder"
                 ));
                 return Promise.resolve(false);
             }
         } else {
             if (!stat) {
-                this.filePickBox.validationMessage = ( localize(15384, "Please enter a path that exists."));
+                this.filePickBox.validationMessage = ( localize(15582, "Please enter a path that exists."));
                 return Promise.resolve(false);
             } else if (uri.path === "/" && this.isWindows) {
-                this.filePickBox.validationMessage = ( localize(15386, "Please start the path with a drive letter."));
+                this.filePickBox.validationMessage = ( localize(15584, "Please start the path with a drive letter."));
                 return Promise.resolve(false);
             } else if (stat.isDirectory && !this.allowFolderSelection) {
-                this.filePickBox.validationMessage = ( localize(15387, "Please select a file."));
+                this.filePickBox.validationMessage = ( localize(15585, "Please select a file."));
                 return Promise.resolve(false);
             } else if (!stat.isDirectory && !this.allowFileSelection) {
-                this.filePickBox.validationMessage = ( localize(15388, "Please select a folder."));
+                this.filePickBox.validationMessage = ( localize(15586, "Please select a folder."));
                 return Promise.resolve(false);
             }
         }