@codingame/monaco-vscode-dialogs-service-override 25.1.2 → 26.0.0

package/package.json

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

package/vscode/src/vs/workbench/browser/parts/dialogs/dialog.web.contribution.js

@@ -16,8 +16,20 @@ import { createBrowserAboutDialogDetails } from '@codingame/monaco-vscode-api/vs
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 
 let DialogHandlerContribution = class DialogHandlerContribution extends Disposable {
-    static { this.ID = 'workbench.contrib.dialogHandler'; }
-    constructor(dialogService, logService, layoutService, keybindingService, instantiationService, productService, clipboardService, openerService, markdownRendererService) {
+    static {
+        this.ID = "workbench.contrib.dialogHandler";
+    }
+    constructor(
+        dialogService,
+        logService,
+        layoutService,
+        keybindingService,
+        instantiationService,
+        productService,
+        clipboardService,
+        openerService,
+        markdownRendererService
+    ) {
         super();
         this.dialogService = dialogService;
         this.productService = productService;
@@ -46,21 +58,21 @@ let DialogHandlerContribution = class DialogHandlerContribution extends Disposab
                 if (this.currentDialog.args.confirmArgs) {
                     const args = this.currentDialog.args.confirmArgs;
                     result = await this.impl.value.confirm(args.confirmation);
-                }
-                else if (this.currentDialog.args.inputArgs) {
+                } else if (this.currentDialog.args.inputArgs) {
                     const args = this.currentDialog.args.inputArgs;
                     result = await this.impl.value.input(args.input);
-                }
-                else if (this.currentDialog.args.promptArgs) {
+                } else if (this.currentDialog.args.promptArgs) {
                     const args = this.currentDialog.args.promptArgs;
                     result = await this.impl.value.prompt(args.prompt);
-                }
-                else {
+                } else {
                     const aboutDialogDetails = createBrowserAboutDialogDetails(this.productService);
-                    await this.impl.value.about(aboutDialogDetails.title, aboutDialogDetails.details, aboutDialogDetails.detailsToCopy);
+                    await this.impl.value.about(
+                        aboutDialogDetails.title,
+                        aboutDialogDetails.details,
+                        aboutDialogDetails.detailsToCopy
+                    );
                 }
-            }
-            catch (error) {
+            } catch (error) {
                 result = error;
             }
             this.currentDialog.close(result);
@@ -68,18 +80,11 @@ let DialogHandlerContribution = class DialogHandlerContribution extends Disposab
         }
     }
 };
-DialogHandlerContribution = ( __decorate([
-    ( __param(0, IDialogService)),
-    ( __param(1, ILogService)),
-    ( __param(2, ILayoutService)),
-    ( __param(3, IKeybindingService)),
-    ( __param(4, IInstantiationService)),
-    ( __param(5, IProductService)),
-    ( __param(6, IClipboardService)),
-    ( __param(7, IOpenerService)),
-    ( __param(8, IMarkdownRendererService))
-], DialogHandlerContribution));
-registerWorkbenchContribution2(DialogHandlerContribution.ID, DialogHandlerContribution, WorkbenchPhase.BlockStartup
+DialogHandlerContribution = ( __decorate([( __param(0, IDialogService)), ( __param(1, ILogService)), ( __param(2, ILayoutService)), ( __param(3, IKeybindingService)), ( __param(4, IInstantiationService)), ( __param(5, IProductService)), ( __param(6, IClipboardService)), ( __param(7, IOpenerService)), ( __param(8, IMarkdownRendererService))], DialogHandlerContribution));
+registerWorkbenchContribution2(
+    DialogHandlerContribution.ID,
+    DialogHandlerContribution,
+    WorkbenchPhase.BlockStartup
 );
 
 export { DialogHandlerContribution };

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

@@ -17,16 +17,28 @@ import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscod
 
 var BrowserDialogHandler_1;
 let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHandler {
-    static { BrowserDialogHandler_1 = this; }
-    static { this.ALLOWABLE_COMMANDS = [
-        'copy',
-        'cut',
-        'editor.action.selectAll',
-        'editor.action.clipboardCopyAction',
-        'editor.action.clipboardCutAction',
-        'editor.action.clipboardPasteAction'
-    ]; }
-    constructor(logService, layoutService, keybindingService, instantiationService, clipboardService, openerService, markdownRendererService) {
+    static {
+        BrowserDialogHandler_1 = this;
+    }
+    static {
+        this.ALLOWABLE_COMMANDS = [
+            "copy",
+            "cut",
+            "editor.action.selectAll",
+            "editor.action.clipboardCopyAction",
+            "editor.action.clipboardCutAction",
+            "editor.action.clipboardPasteAction"
+        ];
+    }
+    constructor(
+        logService,
+        layoutService,
+        keybindingService,
+        instantiationService,
+        clipboardService,
+        openerService,
+        markdownRendererService
+    ) {
         super();
         this.logService = logService;
         this.layoutService = layoutService;
@@ -36,41 +48,89 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         this.markdownRendererService = markdownRendererService;
     }
     async prompt(prompt) {
-        this.logService.trace('DialogService#prompt', prompt.message);
+        this.logService.trace("DialogService#prompt", prompt.message);
         const buttons = this.getPromptButtons(prompt);
-        const { button, checkboxChecked } = await this.doShow(prompt.type, prompt.message, buttons, prompt.detail, prompt.cancelButton ? buttons.length - 1 : -1 , prompt.checkbox, undefined, typeof prompt?.custom === 'object' ? prompt.custom : undefined);
+        const {
+            button,
+            checkboxChecked
+        } = await this.doShow(
+            prompt.type,
+            prompt.message,
+            buttons,
+            prompt.detail,
+            prompt.cancelButton ? buttons.length - 1 : -1,
+            prompt.checkbox,
+            undefined,
+            typeof prompt?.custom === "object" ? prompt.custom : undefined
+        );
         return this.getPromptResult(prompt, button, checkboxChecked);
     }
     async confirm(confirmation) {
-        this.logService.trace('DialogService#confirm', confirmation.message);
+        this.logService.trace("DialogService#confirm", confirmation.message);
         const buttons = this.getConfirmationButtons(confirmation);
-        const { button, checkboxChecked } = await this.doShow(confirmation.type ?? 'question', confirmation.message, buttons, confirmation.detail, buttons.length - 1, confirmation.checkbox, undefined, typeof confirmation?.custom === 'object' ? confirmation.custom : undefined);
-        return { confirmed: button === 0, checkboxChecked };
+        const {
+            button,
+            checkboxChecked
+        } = await this.doShow(
+            confirmation.type ?? "question",
+            confirmation.message,
+            buttons,
+            confirmation.detail,
+            buttons.length - 1,
+            confirmation.checkbox,
+            undefined,
+            typeof confirmation?.custom === "object" ? confirmation.custom : undefined
+        );
+        return {
+            confirmed: button === 0,
+            checkboxChecked
+        };
     }
     async input(input) {
-        this.logService.trace('DialogService#input', input.message);
+        this.logService.trace("DialogService#input", input.message);
         const buttons = this.getInputButtons(input);
-        const { button, checkboxChecked, values } = await this.doShow(input.type ?? 'question', input.message, buttons, input.detail, buttons.length - 1, input?.checkbox, input.inputs, typeof input.custom === 'object' ? input.custom : undefined);
-        return { confirmed: button === 0, checkboxChecked, values };
+        const {
+            button,
+            checkboxChecked,
+            values
+        } = await this.doShow(
+            input.type ?? "question",
+            input.message,
+            buttons,
+            input.detail,
+            buttons.length - 1,
+            input?.checkbox,
+            input.inputs,
+            typeof input.custom === "object" ? input.custom : undefined
+        );
+        return {
+            confirmed: button === 0,
+            checkboxChecked,
+            values
+        };
     }
     async about(title, details, detailsToCopy) {
-        const { button } = await this.doShow(Severity.Info, title, [
-            ( localize(3047, "&&Copy")),
-            ( localize(3048, "OK"))
-        ], details, 1);
+        const {
+            button
+        } = await this.doShow(Severity.Info, title, [( localize(3051, "&&Copy")), ( localize(3052, "OK"))], details, 1);
         if (button === 0) {
             this.clipboardService.writeText(detailsToCopy);
         }
     }
     async doShow(type, message, buttons, detail, cancelId, checkbox, inputs, customOptions) {
         const dialogDisposables = ( new DisposableStore());
-        const renderBody = customOptions ? (parent) => {
+        const renderBody = customOptions ? parent => {
             parent.classList.add(...(customOptions.classes || []));
             customOptions.markdownDetails?.forEach(markdownDetail => {
                 const result = dialogDisposables.add(this.markdownRendererService.render(markdownDetail.markdown, {
                     actionHandler: markdownDetail.actionHandler || ((link, mdStr) => {
-                        return openLinkFromMarkdown(this.openerService, link, mdStr.isTrusted, true );
-                    }),
+                        return openLinkFromMarkdown(
+                            this.openerService,
+                            link,
+                            mdStr.isTrusted,
+                            true
+                        );
+                    })
                 }));
                 parent.appendChild(result.element);
                 result.element.classList.add(...(markdownDetail.classes || []));
@@ -87,7 +147,9 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
                 renderBody,
                 icon: customOptions?.icon,
                 disableCloseAction: customOptions?.disableCloseAction,
-                buttonOptions: customOptions?.buttonDetails?.map(detail => ({ sublabel: detail })),
+                buttonOptions: customOptions?.buttonDetails?.map(detail => ({
+                    sublabel: detail
+                })),
                 checkboxLabel: checkbox?.label,
                 checkboxChecked: checkbox?.checked,
                 inputs
@@ -99,14 +161,6 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         return result;
     }
 };
-BrowserDialogHandler = BrowserDialogHandler_1 = ( __decorate([
-    ( __param(0, ILogService)),
-    ( __param(1, ILayoutService)),
-    ( __param(2, IKeybindingService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IClipboardService)),
-    ( __param(5, IOpenerService)),
-    ( __param(6, IMarkdownRendererService))
-], BrowserDialogHandler));
+BrowserDialogHandler = BrowserDialogHandler_1 = ( __decorate([( __param(0, ILogService)), ( __param(1, ILayoutService)), ( __param(2, IKeybindingService)), ( __param(3, IInstantiationService)), ( __param(4, IClipboardService)), ( __param(5, IOpenerService)), ( __param(6, IMarkdownRendererService))], BrowserDialogHandler));
 
 export { BrowserDialogHandler };

package/vscode/src/vs/workbench/common/dialogs.js

@@ -20,8 +20,7 @@ class DialogsModel extends Disposable {
                 this.dialogs.splice(0, 1);
                 if (result instanceof Error) {
                     promise.error(result);
-                }
-                else {
+                } else {
                     promise.complete(result);
                 }
                 this._onDidShowDialog.fire();