@codingame/monaco-vscode-dialogs-service-override 1.83.15 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "1.83.15",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.15",
-    "monaco-editor": "0.44.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.83.15"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.0-next.0"
   }
 }

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

@@ -36,20 +36,25 @@ let DialogHandlerContribution = class DialogHandlerContribution extends Disposab
         while (this.model.dialogs.length) {
             this.currentDialog = this.model.dialogs[0];
             let result = undefined;
-            if (this.currentDialog.args.confirmArgs) {
-                const args = this.currentDialog.args.confirmArgs;
-                result = await this.impl.confirm(args.confirmation);
+            try {
+                if (this.currentDialog.args.confirmArgs) {
+                    const args = this.currentDialog.args.confirmArgs;
+                    result = await this.impl.confirm(args.confirmation);
+                }
+                else if (this.currentDialog.args.inputArgs) {
+                    const args = this.currentDialog.args.inputArgs;
+                    result = await this.impl.input(args.input);
+                }
+                else if (this.currentDialog.args.promptArgs) {
+                    const args = this.currentDialog.args.promptArgs;
+                    result = await this.impl.prompt(args.prompt);
+                }
+                else {
+                    await this.impl.about();
+                }
             }
-            else if (this.currentDialog.args.inputArgs) {
-                const args = this.currentDialog.args.inputArgs;
-                result = await this.impl.input(args.input);
-            }
-            else if (this.currentDialog.args.promptArgs) {
-                const args = this.currentDialog.args.promptArgs;
-                result = await this.impl.prompt(args.prompt);
-            }
-            else {
-                await this.impl.about();
+            catch (error) {
+                result = error;
             }
             this.currentDialog.close(result);
             this.currentDialog = undefined;

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

@@ -92,12 +92,12 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
                 dialogDisposables.add(result);
             });
         } : undefined;
-        const dialog = ( new Dialog(this.layoutService.container, message, buttons, {
+        const dialog = ( new Dialog(this.layoutService.activeContainer, message, buttons, {
             detail,
             cancelId,
             type: this.getDialogType(type),
             keyEventProcessor: (event) => {
-                const resolved = this.keybindingService.softDispatch(event, this.layoutService.container);
+                const resolved = this.keybindingService.softDispatch(event, this.layoutService.activeContainer);
                 if (resolved.kind === 2  && resolved.commandId) {
                     if (BrowserDialogHandler_1.ALLOWABLE_COMMANDS.indexOf(resolved.commandId) === -1) {
                         EventHelper.stop(event, true);

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

@@ -17,7 +17,12 @@ class DialogsModel extends Disposable {
             args: dialog,
             close: result => {
                 this.dialogs.splice(0, 1);
-                promise.complete(result);
+                if (result instanceof Error) {
+                    promise.error(result);
+                }
+                else {
+                    promise.complete(result);
+                }
                 this._onDidShowDialog.fire();
             }
         };

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

@@ -49,10 +49,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         this.codeEditorService = codeEditorService;
         this.logService = logService;
     }
-    async defaultFilePath(schemeFilter = this.getSchemeFilterForWindow()) {
-        let candidate = this.historyService.getLastActiveFile(schemeFilter);
+    async defaultFilePath(schemeFilter = this.getSchemeFilterForWindow(), authorityFilter = this.getAuthorityFilterForWindow()) {
+        let candidate = this.historyService.getLastActiveFile(schemeFilter, authorityFilter);
         if (!candidate) {
-            candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter);
+            candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
         }
         else {
             candidate = resources.dirname(candidate);
@@ -62,10 +62,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
         return candidate;
     }
-    async defaultFolderPath(schemeFilter = this.getSchemeFilterForWindow()) {
-        let candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter);
+    async defaultFolderPath(schemeFilter = this.getSchemeFilterForWindow(), authorityFilter = this.getAuthorityFilterForWindow()) {
+        let candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
         if (!candidate) {
-            candidate = this.historyService.getLastActiveFile(schemeFilter);
+            candidate = this.historyService.getLastActiveFile(schemeFilter, authorityFilter);
         }
         if (!candidate) {
             return this.preferredHome(schemeFilter);
@@ -290,6 +290,9 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getSchemeFilterForWindow(defaultUriScheme) {
         return defaultUriScheme ?? this.pathService.defaultUriScheme;
     }
+    getAuthorityFilterForWindow() {
+        return this.environmentService.remoteAuthority;
+    }
     getFileSystemSchema(options) {
         return options.availableFileSystems && options.availableFileSystems[0] || this.getSchemeFilterForWindow(options.defaultUri?.scheme);
     }

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

@@ -27,6 +27,7 @@ import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/commo
 import { normalizeDriveLetter } from 'monaco-editor/esm/vs/base/common/labels.js';
 import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
 import { IAccessibilityService } from 'monaco-editor/esm/vs/platform/accessibility/common/accessibility.js';
+import { getActiveDocument } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var OpenLocalFileCommand;
@@ -639,7 +640,7 @@ let SimpleFileDialog = class SimpleFileDialog {
             this.autoCompletePathSegment = '';
             this.activeItem = quickPickItem;
             if (force) {
-                document.execCommand('insertText', false, '');
+                getActiveDocument().execCommand('insertText', false, '');
             }
             return false;
         }
@@ -676,7 +677,7 @@ let SimpleFileDialog = class SimpleFileDialog {
     }
     insertText(wholeValue, insertText) {
         if (this.filePickBox.inputHasFocus()) {
-            document.execCommand('insertText', false, insertText);
+            getActiveDocument().execCommand('insertText', false, insertText);
             if (this.filePickBox.value !== wholeValue) {
                 this.filePickBox.value = wholeValue;
                 this.handleValueChange(wholeValue);

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

@@ -34,7 +34,11 @@ let DialogService = class DialogService extends Disposable {
             throw new Error(`DialogService: refused to show dialog in tests. Contents: ${prompt.message}`);
         }
         const handle = this.model.show({ promptArgs: { prompt } });
-        return await handle.result;
+        const dialogResult = await handle.result;
+        return {
+            result: await dialogResult.result,
+            checkboxChecked: dialogResult.checkboxChecked
+        };
     }
     async input(input) {
         if (this.skipDialogs()) {