@codingame/monaco-vscode-dialogs-service-override 26.2.2 → 28.0.0

package/package.json

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

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

@@ -1,14 +1,8 @@
-import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
-import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
-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 { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
-import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
-import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 export declare class DialogHandlerContribution extends Disposable implements IWorkbenchContribution {
     private dialogService;
     private productService;
@@ -16,6 +10,6 @@ export declare class DialogHandlerContribution extends Disposable implements IWo
     private readonly model;
     private readonly impl;
     private currentDialog;
-    constructor(dialogService: IDialogService, logService: ILogService, layoutService: ILayoutService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, productService: IProductService, clipboardService: IClipboardService, openerService: IOpenerService, markdownRendererService: IMarkdownRendererService);
+    constructor(dialogService: IDialogService, instantiationService: IInstantiationService, productService: IProductService);
     private processDialogs;
 }

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

@@ -1,47 +1,23 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
-import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-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 { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { BrowserDialogHandler } from './dialogHandler.js';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
-import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { createBrowserAboutDialogDetails } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/browser/dialog';
-import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
+import { createBrowserAboutDialogDetails } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/dialogs/dialog';
 
 let DialogHandlerContribution = class DialogHandlerContribution extends Disposable {
     static {
         this.ID = "workbench.contrib.dialogHandler";
     }
-    constructor(
-        dialogService,
-        logService,
-        layoutService,
-        keybindingService,
-        instantiationService,
-        productService,
-        clipboardService,
-        openerService,
-        markdownRendererService
-    ) {
+    constructor(dialogService, instantiationService, productService) {
         super();
         this.dialogService = dialogService;
         this.productService = productService;
-        this.impl = ( new Lazy(() => ( new BrowserDialogHandler(
-            logService,
-            layoutService,
-            keybindingService,
-            instantiationService,
-            clipboardService,
-            openerService,
-            markdownRendererService
-        ))));
+        this.impl = ( new Lazy(() => instantiationService.createInstance(BrowserDialogHandler)));
         this.model = this.dialogService.model;
         this._register(this.model.onWillShowDialog(() => {
             if (!this.currentDialog) {
@@ -80,7 +56,7 @@ 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));
+DialogHandlerContribution = ( __decorate([( __param(0, IDialogService)), ( __param(1, IInstantiationService)), ( __param(2, IProductService))], DialogHandlerContribution));
 registerWorkbenchContribution2(
     DialogHandlerContribution.ID,
     DialogHandlerContribution,

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

@@ -6,6 +6,7 @@ import { IClipboardService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IMarkdownRendererService } from "@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 export declare class BrowserDialogHandler extends AbstractDialogHandler {
     private readonly logService;
     private readonly layoutService;
@@ -13,8 +14,9 @@ export declare class BrowserDialogHandler extends AbstractDialogHandler {
     private readonly clipboardService;
     private readonly openerService;
     private readonly markdownRendererService;
+    private readonly hostService;
     private static readonly ALLOWABLE_COMMANDS;
-    constructor(logService: ILogService, layoutService: ILayoutService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, clipboardService: IClipboardService, openerService: IOpenerService, markdownRendererService: IMarkdownRendererService);
+    constructor(logService: ILogService, layoutService: ILayoutService, keybindingService: IKeybindingService, instantiationService: IInstantiationService, clipboardService: IClipboardService, openerService: IOpenerService, markdownRendererService: IMarkdownRendererService, hostService: IHostService);
     prompt<T>(prompt: IPrompt<T>): Promise<IAsyncPromptResult<T>>;
     confirm(confirmation: IConfirmation): Promise<IConfirmationResult>;
     input(input: IInput): Promise<IInputResult>;

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

@@ -13,7 +13,8 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { openLinkFromMarkdown } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer';
 import { IMarkdownRendererService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markdown/browser/markdownRenderer.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
-import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/browser/dialog';
+import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/dialogs/dialog';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 
 var BrowserDialogHandler_1;
 let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHandler {
@@ -21,14 +22,14 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         BrowserDialogHandler_1 = this;
     }
     static {
-        this.ALLOWABLE_COMMANDS = [
+        this.ALLOWABLE_COMMANDS = ( new Set([
             "copy",
             "cut",
             "editor.action.selectAll",
             "editor.action.clipboardCopyAction",
             "editor.action.clipboardCutAction",
             "editor.action.clipboardPasteAction"
-        ];
+        ]));
     }
     constructor(
         logService,
@@ -37,7 +38,8 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         instantiationService,
         clipboardService,
         openerService,
-        markdownRendererService
+        markdownRendererService,
+        hostService
     ) {
         super();
         this.logService = logService;
@@ -46,6 +48,7 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
         this.clipboardService = clipboardService;
         this.openerService = openerService;
         this.markdownRendererService = markdownRendererService;
+        this.hostService = hostService;
     }
     async prompt(prompt) {
         this.logService.trace("DialogService#prompt", prompt.message);
@@ -61,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);
     }
@@ -79,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,
@@ -101,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,
@@ -112,12 +118,22 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
     async about(title, details, detailsToCopy) {
         const {
             button
-        } = await this.doShow(Severity.Info, title, [( localize(3051, "&&Copy")), ( localize(3052, "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 || []));
@@ -153,14 +169,17 @@ let BrowserDialogHandler = class BrowserDialogHandler extends AbstractDialogHand
                 checkboxLabel: checkbox?.label,
                 checkboxChecked: checkbox?.checked,
                 inputs
-            }, this.keybindingService, this.layoutService, BrowserDialogHandler_1.ALLOWABLE_COMMANDS)
+            }, 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;
     }
 };
-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)), ( __param(7, IHostService))], BrowserDialogHandler));
 
 export { BrowserDialogHandler };

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

@@ -19,6 +19,7 @@ import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { ICodeEditorService } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/services/codeEditorService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
 export declare abstract class AbstractFileDialogService implements IFileDialogService {
     protected readonly hostService: IHostService;
     protected readonly contextService: IWorkspaceContextService;
@@ -37,8 +38,9 @@ export declare abstract class AbstractFileDialogService implements IFileDialogSe
     protected readonly editorService: IEditorService;
     protected readonly codeEditorService: ICodeEditorService;
     protected readonly logService: ILogService;
+    private readonly remoteAgentService;
     readonly _serviceBrand: undefined;
-    constructor(hostService: IHostService, contextService: IWorkspaceContextService, historyService: IHistoryService, environmentService: IWorkbenchEnvironmentService, instantiationService: IInstantiationService, configurationService: IConfigurationService, fileService: IFileService, openerService: IOpenerService, dialogService: IDialogService, languageService: ILanguageService, workspacesService: IWorkspacesService, labelService: ILabelService, pathService: IPathService, commandService: ICommandService, editorService: IEditorService, codeEditorService: ICodeEditorService, logService: ILogService);
+    constructor(hostService: IHostService, contextService: IWorkspaceContextService, historyService: IHistoryService, environmentService: IWorkbenchEnvironmentService, instantiationService: IInstantiationService, configurationService: IConfigurationService, fileService: IFileService, openerService: IOpenerService, dialogService: IDialogService, languageService: ILanguageService, workspacesService: IWorkspacesService, labelService: ILabelService, pathService: IPathService, commandService: ICommandService, editorService: IEditorService, codeEditorService: ICodeEditorService, logService: ILogService, remoteAgentService: IRemoteAgentService);
     defaultFilePath(schemeFilter?: string, authorityFilter?: string | undefined): Promise<URI>;
     defaultFolderPath(schemeFilter?: string, authorityFilter?: string | undefined): Promise<URI>;
     preferredHome(schemeFilter?: string): Promise<URI>;
@@ -58,6 +60,12 @@ export declare abstract class AbstractFileDialogService implements IFileDialogSe
     protected getSimpleFileDialog(): ISimpleFileDialog;
     private pickResource;
     private saveRemoteResource;
+    /**
+     * Checks whether the given resource is a remote user data file
+     * that should not be used as a default file dialog path candidate.
+     * This covers remote user data files such as settings.json, keybindings.json, etc.
+     */
+    private isRemoteUserData;
     private getSchemeFilterForWindow;
     private getAuthorityFilterForWindow;
     protected getFileSystemSchema(options: {

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

@@ -8,7 +8,7 @@ import { WorkbenchState, isSavedWorkspace, isTemporaryWorkspace, WORKSPACE_EXTEN
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { dirname, toLocalResource, basename, extname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { dirname, toLocalResource, basename, isEqual, isEqualOrParent, extname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isAbsolute, normalize } from '@codingame/monaco-vscode-api/vscode/vs/base/common/path';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { SimpleFileDialog } from './simpleFileDialog.js';
@@ -30,6 +30,7 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { EditorOpenSource } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 
 let AbstractFileDialogService = class AbstractFileDialogService {
     constructor(
@@ -49,7 +50,8 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         commandService,
         editorService,
         codeEditorService,
-        logService
+        logService,
+        remoteAgentService
     ) {
         this.hostService = hostService;
         this.contextService = contextService;
@@ -68,12 +70,19 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         this.editorService = editorService;
         this.codeEditorService = codeEditorService;
         this.logService = logService;
+        this.remoteAgentService = remoteAgentService;
     }
     async defaultFilePath(
         schemeFilter = this.getSchemeFilterForWindow(),
         authorityFilter = this.getAuthorityFilterForWindow()
     ) {
         let candidate = this.historyService.getLastActiveFile(schemeFilter, authorityFilter);
+        if (candidate && (await this.isRemoteUserData(candidate))) {
+            this.logService.debug(
+                `[FileDialogService] Skipping last active file as it is a remote user data resource: ${candidate}`
+            );
+            candidate = undefined;
+        }
         if (!candidate) {
             candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
             if (candidate) {
@@ -100,6 +109,12 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         let candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
         if (!candidate) {
             candidate = this.historyService.getLastActiveFile(schemeFilter, authorityFilter);
+            if (candidate && (await this.isRemoteUserData(candidate))) {
+                this.logService.debug(
+                    `[FileDialogService] Skipping last active file as it is a remote user data resource: ${candidate}`
+                );
+                candidate = undefined;
+            }
             if (candidate) {
                 this.logService.debug(
                     `[FileDialogService] Default folder path using parent of last active file: ${candidate}`
@@ -187,16 +202,16 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             return ConfirmResult.DONT_SAVE;
         }
         let message;
-        let detail = ( localize(14418, "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(
-                14419,
+                15545,
                 "Do you want to save the changes you made to {0}?",
                 typeof fileNamesOrResources[0] === "string" ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
         } else {
             message = ( localize(
-                14420,
+                15546,
                 "Do you want to save the changes to the following {0} files?",
                 fileNamesOrResources.length
             ));
@@ -209,10 +224,10 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             message,
             detail,
             buttons: [{
-                label: fileNamesOrResources.length > 1 ? ( localize(14421, "&&Save All")) : ( localize(14422, "&&Save")),
+                label: fileNamesOrResources.length > 1 ? ( localize(15547, "&&Save All")) : ( localize(15548, "&&Save")),
                 run: () => ConfirmResult.SAVE
             }, {
-                label: ( localize(14423, "Do&&n't Save")),
+                label: ( localize(15549, "Do&&n't Save")),
                 run: () => ConfirmResult.DONT_SAVE
             }],
             cancelButton: {
@@ -225,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(14424, "Open File or Folder"));
+        const title = ( localize(15550, "Open File or Folder"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({
             canSelectFiles: true,
@@ -264,7 +279,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(14425, "Open File"));
+        const title = ( localize(15551, "Open File"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
         const uri = await this.pickResource({
             canSelectFiles: true,
@@ -305,7 +320,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( localize(14426, "Open Folder"));
+        const title = ( localize(15552, "Open Folder"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
         const uri = await this.pickResource({
             canSelectFiles: false,
@@ -325,9 +340,9 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( localize(14427, "Open Workspace from File"));
+        const title = ( localize(15553, "Open Workspace from File"));
         const filters = [{
-            name: ( localize(14428, "Workspace")),
+            name: ( localize(15554, "Workspace")),
             extensions: [WORKSPACE_EXTENSION]
         }];
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
@@ -353,7 +368,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( localize(14429, "Save As"));
+        options.title = ( localize(15555, "Save As"));
         const uri = await this.saveRemoteResource(options);
         if (uri) {
             this.addFileToRecentlyOpened(uri);
@@ -382,6 +397,21 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     saveRemoteResource(options) {
         return this.getSimpleFileDialog().showSaveDialog(options);
     }
+    async isRemoteUserData(resource) {
+        if (!this.environmentService.remoteAuthority) {
+            return false;
+        }
+        const remoteEnv = await this.remoteAgentService.getEnvironment();
+        if (remoteEnv) {
+            const remoteDataHome = dirname(dirname(remoteEnv.settingsPath));
+            if (!isEqual(remoteDataHome, remoteDataHome.with({
+                path: "/"
+            })) && isEqualOrParent(resource, remoteDataHome)) {
+                return true;
+            }
+        }
+        return false;
+    }
     getSchemeFilterForWindow(defaultUriScheme) {
         return defaultUriScheme ?? this.pathService.defaultUriScheme;
     }
@@ -404,7 +434,7 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( localize(14430, "Save As")),
+            title: ( localize(15556, "Save As")),
             availableFileSystems
         };
         const ext = defaultUri ? extname(defaultUri) : undefined;
@@ -442,15 +472,15 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             };
         }
         options.filters = coalesce([{
-            name: ( localize(14431, "All Files")),
+            name: ( localize(15557, "All Files")),
             extensions: ["*"]
         }, matchingFilter, ...registeredLanguageFilters, {
-            name: ( localize(14432, "No Extension")),
+            name: ( localize(15558, "No Extension")),
             extensions: [""]
         }]);
         return options;
     }
 };
-AbstractFileDialogService = ( __decorate([( __param(0, IHostService)), ( __param(1, IWorkspaceContextService)), ( __param(2, IHistoryService)), ( __param(3, IWorkbenchEnvironmentService)), ( __param(4, IInstantiationService)), ( __param(5, IConfigurationService)), ( __param(6, IFileService)), ( __param(7, IOpenerService)), ( __param(8, IDialogService)), ( __param(9, ILanguageService)), ( __param(10, IWorkspacesService)), ( __param(11, ILabelService)), ( __param(12, IPathService)), ( __param(13, ICommandService)), ( __param(14, IEditorService)), ( __param(15, ICodeEditorService)), ( __param(16, ILogService))], AbstractFileDialogService));
+AbstractFileDialogService = ( __decorate([( __param(0, IHostService)), ( __param(1, IWorkspaceContextService)), ( __param(2, IHistoryService)), ( __param(3, IWorkbenchEnvironmentService)), ( __param(4, IInstantiationService)), ( __param(5, IConfigurationService)), ( __param(6, IFileService)), ( __param(7, IOpenerService)), ( __param(8, IDialogService)), ( __param(9, ILanguageService)), ( __param(10, IWorkspacesService)), ( __param(11, ILabelService)), ( __param(12, IPathService)), ( __param(13, ICommandService)), ( __param(14, IEditorService)), ( __param(15, ICodeEditorService)), ( __param(16, ILogService)), ( __param(17, IRemoteAgentService))], AbstractFileDialogService));
 
 export { AbstractFileDialogService };

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(14433, "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(14433, "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(
-            14434,
+            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(14435, "&&Open Remote...")),
+            label: ( localize(15561, "&&Open Remote...")),
             run: async () => {
                 await this.commandService.executeCommand("workbench.action.remote.showMenu");
             }
         }, {
-            label: ( localize(14436, "&&Learn More")),
+            label: ( localize(15562, "&&Learn More")),
             run: async () => {
                 await this.openerService.open("https://aka.ms/VSCodeWebLocalFileSystemAccess");
             }
         }];
         if (context === "open") {
             buttons.push({
-                label: ( localize(14437, "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(14438, "Opening Local Folders is Unsupported")),
+            message: ( localize(15564, "Opening Local Folders is Unsupported")),
             detail: ( localize(
-                14439,
+                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

@@ -25,7 +25,7 @@ import { format, equalsIgnoreCase, startsWithIgnoreCase } from '@codingame/monac
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { isValidBasename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/extpath';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { createCancelablePromise } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { normalizeDriveLetter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
@@ -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(14440, "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(14441, "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(14442, "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(14443, "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(
-                14444,
+                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(14445, "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(14446, "Show Local"));
+                this.filePickBox.customLabel = ( localize(15572, "Show Local"));
                 this.filePickBox.customButtonSecondary = true;
                 let action;
                 if (isSave) {
@@ -374,9 +374,10 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
                     });
                 }
             }));
+            const busyDisposable = this._register(( new MutableDisposable()));
             const handleAccept = () => {
                 if (this.busy) {
-                    this.onBusyChangeEmitter.event(busy => {
+                    busyDisposable.value = this.onBusyChangeEmitter.event(busy => {
                         if (!busy) {
                             handleAccept();
                         }
@@ -464,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(14447, "Hide dot files")) : ( localize(14448, "Show dot files")),
+            tooltip: this._showDotFiles ? ( localize(15573, "Hide dot files")) : ( localize(15574, "Show dot files")),
             alwaysVisible: true
         }];
     }
@@ -619,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(14449, "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 {
@@ -783,7 +784,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         prompt.ignoreFocusOut = true;
         prompt.ok = true;
         prompt.customButton = true;
-        prompt.customLabel = ( localize(14450, "Cancel"));
+        prompt.customLabel = ( localize(15576, "Cancel"));
         prompt.customButtonSecondary = true;
         prompt.value = this.pathFromUri(uri);
         let isResolving = false;
@@ -812,7 +813,7 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
     }
     async validate(uri) {
         if (uri === undefined) {
-            this.filePickBox.validationMessage = ( localize(14451, "Please enter a valid path."));
+            this.filePickBox.validationMessage = ( localize(15577, "Please enter a valid path."));
             return Promise.resolve(false);
         }
         let stat;
@@ -823,47 +824,47 @@ let SimpleFileDialog = class SimpleFileDialog extends Disposable {
         } catch (e) {}
         if (this.requiresTrailing) {
             if (stat?.isDirectory) {
-                this.filePickBox.validationMessage = ( localize(14452, "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(
-                    14453,
+                    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(14454, "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(
-                    14455,
+                    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(14456, "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(
-                    14457,
+                    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(14456, "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(14458, "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(14459, "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(14460, "Please select a folder."));
+                this.filePickBox.validationMessage = ( localize(15586, "Please select a folder."));
                 return Promise.resolve(false);
             }
         }