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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-dialogs-service-override",
-  "version": "13.1.7",
+  "version": "14.0.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - dialogs 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-44b92f80-48ea-5562-a8d0-18a015f8d845-common": "13.1.7",
-    "@codingame/monaco-vscode-api": "13.1.7",
-    "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "13.1.7"
+    "@codingame/monaco-vscode-411e0589-fa79-504b-b32c-80a88847b23a-common": "14.0.1",
+    "@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common": "14.0.1",
+    "@codingame/monaco-vscode-api": "14.0.1",
+    "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common": "14.0.1"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/browser/parts/dialogs/dialogHandler.d.ts

@@ -1,4 +1,4 @@
-import { IConfirmation, IConfirmationResult, IInputResult, IInput, AbstractDialogHandler, IPrompt, IAsyncPromptResult } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IConfirmation, IConfirmationResult, IInputResult, IInput, AbstractDialogHandler, IPrompt, IAsyncPromptResult } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
 import { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { AbstractDialogHandler } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs';
+import { AbstractDialogHandler } from '@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs';
 import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
@@ -59,7 +59,7 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
     async about() {
         const detailString = (useAgo) => {
             return localize(
-                2747,
+                2793,
                 "Version: {0}\nCommit: {1}\nDate: {2}\nBrowser: {3}",
                 this.productService.version || 'Unknown',
                 this.productService.commit || 'Unknown',
@@ -70,14 +70,14 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         const detail = detailString(true);
         const detailToCopy = detailString(false);
         const { button } = await this.doShow(Severity.Info, this.productService.nameLong, [
-            ( localize(2748, "&&Copy")),
-            ( localize(2749, "OK"))
+            ( localize(2794, "&&Copy")),
+            ( localize(2795, "OK"))
         ], detail, 1);
         if (button === 0) {
             this.clipboardService.writeText(detailToCopy);
         }
     }
-    async doShow(type, message, buttons, detail, cancelId, checkbox, inputs, customOptions, cancellationToken) {
+    async doShow(type, message, buttons, detail, cancelId, checkbox, inputs, customOptions) {
         const dialogDisposables = ( new DisposableStore());
         const renderBody = customOptions ? (parent) => {
             parent.classList.add(...(customOptions.classes || []));

package/vscode/src/vs/workbench/common/dialogs.d.ts

@@ -1,6 +1,6 @@
 import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IDialogArgs, IDialogResult } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IDialogArgs, IDialogResult } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
 export interface IDialogViewItem {
     readonly args: IDialogArgs;
     close(result?: IDialogResult | Error): void;

package/vscode/src/vs/workbench/contrib/welcomeDialog/browser/welcomeDialog.contribution.js

@@ -90,7 +90,7 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             tags: ['experimental'],
-            description: ( localize(10733, "When enabled, a welcome widget is shown in the editor"))
+            description: ( localize(10930, "When enabled, a welcome widget is shown in the editor"))
         }
     }
 });

package/vscode/src/vs/workbench/contrib/welcomeDialog/browser/welcomeWidget.js

@@ -72,7 +72,7 @@ class WelcomeWidget extends Disposable {
     }
     async buildWidgetContent(title, message, buttonText, buttonAction) {
         const actionBar = this._register(( new ActionBar(this.element, {})));
-        const action = this._register(( new Action('dialog.close', ( localize(10734, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
+        const action = this._register(( new Action('dialog.close', ( localize(10931, "Close Dialog")), ThemeIcon.asClassName(Codicon.dialogClose), true, async () => {
             this._hide();
         })));
         actionBar.push(action, { icon: true, label: false });

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

@@ -1,4 +1,4 @@
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, ConfirmResult } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions, ConfirmResult } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { isWorkspaceToOpen, isFileToOpen } from '@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window';
-import { ConfirmResult, getFileNamesMessage } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs';
+import { ConfirmResult, getFileNamesMessage } from '@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { WorkbenchState, isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTENSION } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
@@ -121,17 +121,17 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             return ConfirmResult.DONT_SAVE;
         }
         let message;
-        let detail = ( localize(11359, "Your changes will be lost if you don't save them."));
+        let detail = ( localize(11556, "Your changes will be lost if you don't save them."));
         if (fileNamesOrResources.length === 1) {
             message = ( localize(
-                11360,
+                11557,
                 "Do you want to save the changes you made to {0}?",
                 typeof fileNamesOrResources[0] === 'string' ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
         }
         else {
             message = ( localize(
-                11361,
+                11558,
                 "Do you want to save the changes to the following {0} files?",
                 fileNamesOrResources.length
             ));
@@ -144,12 +144,12 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             buttons: [
                 {
                     label: fileNamesOrResources.length > 1 ?
-                        ( localize(11362, "&&Save All")) :
-                        ( localize(11363, "&&Save")),
+                        ( localize(11559, "&&Save All")) :
+                        ( localize(11560, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 },
                 {
-                    label: ( localize(11364, "Do&&n't Save")),
+                    label: ( localize(11561, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }
             ],
@@ -163,7 +163,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(11365, 'Open File or Folder'));
+        const title = ( localize(11562, 'Open File or Folder'));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
         if (uri) {
@@ -181,7 +181,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(11366, 'Open File'));
+        const title = ( localize(11563, 'Open File'));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
         if (uri) {
@@ -195,10 +195,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     addFileToRecentlyOpened(uri) {
-        this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri) }]);
+        this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri, { appendWorkspaceSuffix: true }) }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( localize(11367, 'Open Folder'));
+        const title = ( localize(11564, 'Open Folder'));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
         const uri = await this.pickResource({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
         if (uri) {
@@ -206,8 +206,8 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( localize(11368, 'Open Workspace from File'));
-        const filters = [{ name: ( localize(11369, 'Workspace')), extensions: [WORKSPACE_EXTENSION] }];
+        const title = ( localize(11565, 'Open Workspace from File'));
+        const filters = [{ name: ( localize(11566, 'Workspace')), extensions: [WORKSPACE_EXTENSION] }];
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
         const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, filters, availableFileSystems });
         if (uri) {
@@ -218,7 +218,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( localize(11370, 'Save As'));
+        options.title = ( localize(11567, 'Save As'));
         const uri = await this.saveRemoteResource(options);
         if (uri) {
             this.addFileToRecentlyOpened(uri);
@@ -269,7 +269,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( localize(11371, "Save As")),
+            title: ( localize(11568, "Save As")),
             availableFileSystems
         };
         const ext = defaultUri ? extname(defaultUri) : undefined;
@@ -296,10 +296,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             matchingFilter = { name: trim(ext, '.').toUpperCase(), extensions: [trim(ext, '.')] };
         }
         options.filters = coalesce([
-            { name: ( localize(11372, "All Files")), extensions: ['*'] },
+            { name: ( localize(11569, "All Files")), extensions: ['*'] },
             matchingFilter,
             ...registeredLanguageFilters,
-            { name: ( localize(11373, "No Extension")), extensions: [''] }
+            { name: ( localize(11570, "No Extension")), extensions: [''] }
         ]);
         return options;
     }

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

@@ -1,4 +1,4 @@
-import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IPickAndOpenOptions, ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { AbstractFileDialogService } from "./abstractFileDialogService.js";

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(11374, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(11571, "Can't open folders, try adding a folder to the workspace instead."))));
     }
     addFileSchemaIfNeeded(schema, isFolder) {
         return (schema === Schemas.untitled) ? [Schemas.file]
@@ -68,7 +68,7 @@ class FileDialogService extends AbstractFileDialogService {
         if (this.shouldUseSimplified(schema)) {
             return super.pickFolderAndOpenSimplified(schema, options);
         }
-        throw ( new Error(( localize(11374, "Can't open folders, try adding a folder to the workspace instead."))));
+        throw ( new Error(( localize(11571, "Can't open folders, try adding a folder to the workspace instead."))));
     }
     async pickWorkspaceAndOpen(options) {
         options.availableFileSystems = this.getWorkspaceAvailableFileSystems(options);
@@ -80,7 +80,7 @@ class FileDialogService extends AbstractFileDialogService {
             return super.pickWorkspaceAndOpenSimplified(schema, options);
         }
         throw ( new Error(( localize(
-            11375,
+            11572,
             "Can't open workspaces, try adding a folder to the workspace instead."
         ))));
     }
@@ -182,17 +182,17 @@ class FileDialogService extends AbstractFileDialogService {
         }
         const buttons = [
             {
-                label: ( localize(11376, "&&Open Remote...")),
+                label: ( localize(11573, "&&Open Remote...")),
                 run: async () => { await this.commandService.executeCommand('workbench.action.remote.showMenu'); }
             },
             {
-                label: ( localize(11377, "&&Learn More")),
+                label: ( localize(11574, "&&Learn More")),
                 run: async () => { await this.openerService.open('https://aka.ms/VSCodeWebLocalFileSystemAccess'); }
             }
         ];
         if (context === 'open') {
             buttons.push({
-                label: ( localize(11378, "Open &&Files...")),
+                label: ( localize(11575, "Open &&Files...")),
                 run: async () => {
                     const files = await triggerUpload();
                     if (files) {
@@ -212,9 +212,9 @@ class FileDialogService extends AbstractFileDialogService {
         }
         await this.dialogService.prompt({
             type: Severity.Warning,
-            message: ( localize(11379, "Opening Local Folders is Unsupported")),
+            message: ( localize(11576, "Opening Local Folders is Unsupported")),
             detail: ( localize(
-                11380,
+                11577,
                 "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

@@ -1,7 +1,7 @@
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
-import { ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs";
+import { ISaveDialogOptions, IOpenDialogOptions } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IFileDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
@@ -98,6 +98,7 @@ export declare class SimpleFileDialog extends Disposable implements ISimpleFileD
     private filePickBoxValue;
     private onDidAccept;
     private root;
+    private canTildaEscapeHatch;
     private tildaReplace;
     private tryAddTrailingSeparatorToDirectory;
     private tryUpdateItems;

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

@@ -37,7 +37,7 @@ import { getActiveDocument } from '@codingame/monaco-vscode-api/vscode/vs/base/b
 var OpenLocalFileCommand;
 (function (OpenLocalFileCommand) {
     OpenLocalFileCommand.ID = 'workbench.action.files.openLocalFile';
-    OpenLocalFileCommand.LABEL = ( localize(11381, "Open Local File..."));
+    OpenLocalFileCommand.LABEL = ( localize(11578, "Open Local File..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -49,7 +49,7 @@ var OpenLocalFileCommand;
 var SaveLocalFileCommand;
 (function (SaveLocalFileCommand) {
     SaveLocalFileCommand.ID = 'workbench.action.files.saveLocalFile';
-    SaveLocalFileCommand.LABEL = ( localize(11382, "Save Local File..."));
+    SaveLocalFileCommand.LABEL = ( localize(11579, "Save Local File..."));
     function handler() {
         return accessor => {
             const editorService = accessor.get(IEditorService);
@@ -65,7 +65,7 @@ var SaveLocalFileCommand;
 var OpenLocalFolderCommand;
 (function (OpenLocalFolderCommand) {
     OpenLocalFolderCommand.ID = 'workbench.action.files.openLocalFolder';
-    OpenLocalFolderCommand.LABEL = ( localize(11383, "Open Local Folder..."));
+    OpenLocalFolderCommand.LABEL = ( localize(11580, "Open Local Folder..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -77,7 +77,7 @@ var OpenLocalFolderCommand;
 var OpenLocalFileFolderCommand;
 (function (OpenLocalFileFolderCommand) {
     OpenLocalFileFolderCommand.ID = 'workbench.action.files.openLocalFileFolder';
-    OpenLocalFileFolderCommand.LABEL = ( localize(11384, "Open Local..."));
+    OpenLocalFileFolderCommand.LABEL = ( localize(11581, "Open Local..."));
     function handler() {
         return accessor => {
             const dialogService = accessor.get(IFileDialogService);
@@ -177,7 +177,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         if ((this.scheme !== Schemas.file) && !this.fileService.hasProvider(defaultUri)) {
             this.notificationService.info(( localize(
-                11385,
+                11582,
                 'File system provider for {0} is not available.',
                 (defaultUri.toString())
             )));
@@ -248,9 +248,10 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
             this.filePickBox.sortByLabel = false;
             this.filePickBox.ignoreFocusOut = true;
             this.filePickBox.ok = true;
+            this.filePickBox.okLabel = this.options.openLabel;
             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(11386, 'Show Local'));
+                this.filePickBox.customLabel = ( localize(11583, 'Show Local'));
                 let action;
                 if (isSave) {
                     action = SaveLocalFileCommand;
@@ -375,7 +376,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     async handleValueChange(value) {
         try {
             if (this.isValueChangeFromUser()) {
-                if (!equalsIgnoreCase(value, this.constructFullUserPath()) && !this.isBadSubpath(value)) {
+                if (!equalsIgnoreCase(value, this.constructFullUserPath()) && (!this.isBadSubpath(value) || this.canTildaEscapeHatch(value))) {
                     this.filePickBox.validationMessage = undefined;
                     const filePickBoxUri = this.filePickBoxValue();
                     let updated = UpdateResult.NotUpdated;
@@ -447,7 +448,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     }
     async onDidAccept() {
         this.busy = true;
-        if (this.filePickBox.activeItems.length === 1) {
+        if (!this.updatingPromise && this.filePickBox.activeItems.length === 1) {
             const item = this.filePickBox.selectedItems[0];
             if (item.isFolder) {
                 if (this.trailing) {
@@ -471,7 +472,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
                 return;
             }
         }
-        else {
+        else if (!this.updatingPromise) {
             if ((await this.tryUpdateItems(this.filePickBox.value, this.filePickBoxValue())) !== UpdateResult.NotUpdated) {
                 this.filePickBox.busy = false;
                 return;
@@ -503,11 +504,17 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         return dir;
     }
+    canTildaEscapeHatch(value) {
+        return !!(value.endsWith('~') && this.isBadSubpath(value));
+    }
     tildaReplace(value) {
         const home = this.trueHome;
         if ((value.length > 0) && (value[0] === '~')) {
             return joinPath(home, value.substring(1));
         }
+        else if (this.canTildaEscapeHatch(value)) {
+            return home;
+        }
         return this.remoteUriFrom(value);
     }
     tryAddTrailingSeparatorToDirectory(uri, stat) {
@@ -519,7 +526,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         return uri;
     }
     async tryUpdateItems(value, valueUri) {
-        if ((value.length > 0) && (value[0] === '~')) {
+        if ((value.length > 0) && ((value[0] === '~') || this.canTildaEscapeHatch(value))) {
             const newDir = this.tildaReplace(value);
             return (await this.updateItems(newDir, true)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
         }
@@ -545,7 +552,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
                     return (await this.updateItems(valueUri)) ? UpdateResult.UpdatedWithTrailing : UpdateResult.Updated;
                 }
                 else if (this.endsWithSlash(value)) {
-                    this.filePickBox.validationMessage = ( localize(11387, 'The path does not exist.'));
+                    this.filePickBox.validationMessage = ( localize(11584, 'The path does not exist. Use ~ to go to your home directory.'));
                     this.badPath = value;
                     return UpdateResult.InvalidPath;
                 }
@@ -703,7 +710,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         prompt.ignoreFocusOut = true;
         prompt.ok = true;
         prompt.customButton = true;
-        prompt.customLabel = ( localize(11388, 'Cancel'));
+        prompt.customLabel = ( localize(11585, 'Cancel'));
         prompt.value = this.pathFromUri(uri);
         let isResolving = false;
         return ( new Promise(resolve => {
@@ -731,7 +738,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     }
     async validate(uri) {
         if (uri === undefined) {
-            this.filePickBox.validationMessage = ( localize(11389, 'Please enter a valid path.'));
+            this.filePickBox.validationMessage = ( localize(11586, 'Please enter a valid path.'));
             return Promise.resolve(false);
         }
         let stat;
@@ -744,36 +751,36 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         if (this.requiresTrailing) {
             if (stat && stat.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(11390, 'The folder already exists. Please use a new file name.'));
+                this.filePickBox.validationMessage = ( localize(11587, 'The folder already exists. Please use a new file name.'));
                 return Promise.resolve(false);
             }
             else if (stat) {
                 const message = ( localize(
-                    11391,
+                    11588,
                     '{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(11392, 'Please enter a valid file name.'));
+                this.filePickBox.validationMessage = ( localize(11589, 'Please enter a valid file name.'));
                 return Promise.resolve(false);
             }
             else if (!statDirname) {
                 const message = ( localize(
-                    11393,
+                    11590,
                     '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(11394, 'Please enter a path that exists.'));
+                this.filePickBox.validationMessage = ( localize(11591, 'Please enter a path that exists.'));
                 return Promise.resolve(false);
             }
             else if (statDirname.readonly) {
                 this.filePickBox.validationMessage = ( localize(
-                    11395,
+                    11592,
                     'This folder cannot be used as a save destination. Please choose another folder'
                 ));
                 return Promise.resolve(false);
@@ -781,19 +788,19 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         }
         else {
             if (!stat) {
-                this.filePickBox.validationMessage = ( localize(11394, 'Please enter a path that exists.'));
+                this.filePickBox.validationMessage = ( localize(11591, 'Please enter a path that exists.'));
                 return Promise.resolve(false);
             }
             else if (uri.path === '/' && this.isWindows) {
-                this.filePickBox.validationMessage = ( localize(11396, 'Please start the path with a drive letter.'));
+                this.filePickBox.validationMessage = ( localize(11593, 'Please start the path with a drive letter.'));
                 return Promise.resolve(false);
             }
             else if (stat.isDirectory && !this.allowFolderSelection) {
-                this.filePickBox.validationMessage = ( localize(11397, 'Please select a file.'));
+                this.filePickBox.validationMessage = ( localize(11594, 'Please select a file.'));
                 return Promise.resolve(false);
             }
             else if (!stat.isDirectory && !this.allowFileSelection) {
-                this.filePickBox.validationMessage = ( localize(11398, 'Please select a folder.'));
+                this.filePickBox.validationMessage = ( localize(11595, 'Please select a folder.'));
                 return Promise.resolve(false);
             }
         }
@@ -802,6 +809,8 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     async updateItems(newFolder, force = false, trailing) {
         this.busy = true;
         this.autoCompletePathSegment = '';
+        const wasDotDot = trailing === '..';
+        trailing = wasDotDot ? undefined : trailing;
         const isSave = !!trailing;
         let result = false;
         const updatingPromise = createCancelablePromise(async (token) => {
@@ -827,7 +836,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
                 }
                 this.filePickBox.itemActivation = ItemActivation.NONE;
                 this.filePickBox.items = items;
-                if (!equalsIgnoreCase(this.filePickBox.value, newValue) && force) {
+                if (!equalsIgnoreCase(this.filePickBox.value, newValue) && (force || wasDotDot)) {
                     this.filePickBox.valueSelection = [0, this.filePickBox.value.length];
                     this.insertText(newValue, newValue);
                 }

package/vscode/src/vs/workbench/services/dialogs/common/dialogService.d.ts

@@ -1,5 +1,5 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IConfirmation, IConfirmationResult, IInput, IInputResult, IPrompt, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/platform/dialogs/common/dialogs";
+import { IConfirmation, IConfirmationResult, IInput, IInputResult, IPrompt, IPromptResult, IPromptResultWithCancel, IPromptWithCustomCancel, IPromptWithDefaultCancel } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/platform/dialogs/common/dialogs";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { DialogsModel } from "../../../common/dialogs.js";
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";