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

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

@@ -32,7 +32,25 @@ import { EditorOpenSource } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 
 let AbstractFileDialogService = class AbstractFileDialogService {
-    constructor(hostService, contextService, historyService, environmentService, instantiationService, configurationService, fileService, openerService, dialogService, languageService, workspacesService, labelService, pathService, commandService, editorService, codeEditorService, logService) {
+    constructor(
+        hostService,
+        contextService,
+        historyService,
+        environmentService,
+        instantiationService,
+        configurationService,
+        fileService,
+        openerService,
+        dialogService,
+        languageService,
+        workspacesService,
+        labelService,
+        pathService,
+        commandService,
+        editorService,
+        codeEditorService,
+        logService
+    ) {
         this.hostService = hostService;
         this.contextService = contextService;
         this.historyService = historyService;
@@ -51,44 +69,92 @@ let AbstractFileDialogService = class AbstractFileDialogService {
         this.codeEditorService = codeEditorService;
         this.logService = logService;
     }
-    async defaultFilePath(schemeFilter = this.getSchemeFilterForWindow(), authorityFilter = this.getAuthorityFilterForWindow()) {
+    async defaultFilePath(
+        schemeFilter = this.getSchemeFilterForWindow(),
+        authorityFilter = this.getAuthorityFilterForWindow()
+    ) {
         let candidate = this.historyService.getLastActiveFile(schemeFilter, authorityFilter);
         if (!candidate) {
             candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
-        }
-        else {
+            if (candidate) {
+                this.logService.debug(
+                    `[FileDialogService] Default file path using last active workspace root: ${candidate}`
+                );
+            }
+        } else {
+            this.logService.debug(
+                `[FileDialogService] Default file path using parent of last active file: ${candidate}`
+            );
             candidate = dirname(candidate);
         }
         if (!candidate) {
             candidate = await this.preferredHome(schemeFilter);
+            this.logService.debug(`[FileDialogService] Default file path using preferred home: ${candidate}`);
         }
         return candidate;
     }
-    async defaultFolderPath(schemeFilter = this.getSchemeFilterForWindow(), authorityFilter = this.getAuthorityFilterForWindow()) {
+    async defaultFolderPath(
+        schemeFilter = this.getSchemeFilterForWindow(),
+        authorityFilter = this.getAuthorityFilterForWindow()
+    ) {
         let candidate = this.historyService.getLastActiveWorkspaceRoot(schemeFilter, authorityFilter);
         if (!candidate) {
             candidate = this.historyService.getLastActiveFile(schemeFilter, authorityFilter);
+            if (candidate) {
+                this.logService.debug(
+                    `[FileDialogService] Default folder path using parent of last active file: ${candidate}`
+                );
+            }
+        } else {
+            this.logService.debug(
+                `[FileDialogService] Default folder path using last active workspace root: ${candidate}`
+            );
         }
         if (!candidate) {
-            return this.preferredHome(schemeFilter);
+            const preferredHome = await this.preferredHome(schemeFilter);
+            this.logService.debug(
+                `[FileDialogService] Default folder path using preferred home: ${preferredHome}`
+            );
+            return preferredHome;
         }
         return dirname(candidate);
     }
     async preferredHome(schemeFilter = this.getSchemeFilterForWindow()) {
         const preferLocal = schemeFilter === Schemas.file;
-        const preferredHomeConfig = this.configurationService.inspect('files.dialog.defaultPath');
+        const preferredHomeConfig = this.configurationService.inspect("files.dialog.defaultPath");
         const preferredHomeCandidate = preferLocal ? preferredHomeConfig.userLocalValue : preferredHomeConfig.userRemoteValue;
+        this.logService.debug(
+            `[FileDialogService] Preferred home: preferLocal=${preferLocal}, userLocalValue=${preferredHomeConfig.userLocalValue}, userRemoteValue=${preferredHomeConfig.userRemoteValue}`
+        );
         if (preferredHomeCandidate) {
             const isPreferredHomeCandidateAbsolute = preferLocal ? isAbsolute(preferredHomeCandidate) : (await this.pathService.path).isAbsolute(preferredHomeCandidate);
             if (isPreferredHomeCandidateAbsolute) {
                 const preferredHomeNormalized = preferLocal ? normalize(preferredHomeCandidate) : (await this.pathService.path).normalize(preferredHomeCandidate);
-                const preferredHome = toLocalResource(await this.pathService.fileURI(preferredHomeNormalized), this.environmentService.remoteAuthority, this.pathService.defaultUriScheme);
+                const preferredHome = toLocalResource(
+                    await this.pathService.fileURI(preferredHomeNormalized),
+                    this.environmentService.remoteAuthority,
+                    this.pathService.defaultUriScheme
+                );
                 if (await this.fileService.exists(preferredHome)) {
+                    this.logService.debug(
+                        `[FileDialogService] Preferred home using files.dialog.defaultPath setting: ${preferredHome}`
+                    );
                     return preferredHome;
                 }
+                this.logService.debug(
+                    `[FileDialogService] Preferred home files.dialog.defaultPath path does not exist: ${preferredHome}`
+                );
+            } else {
+                this.logService.debug(
+                    `[FileDialogService] Preferred home files.dialog.defaultPath is not absolute: ${preferredHomeCandidate}`
+                );
             }
         }
-        return this.pathService.userHome({ preferLocal });
+        const userHome = this.pathService.userHome({
+            preferLocal
+        });
+        this.logService.debug(`[FileDialogService] Preferred home using user home: ${userHome}`);
+        return userHome;
     }
     async defaultWorkspacePath(schemeFilter = this.getSchemeFilterForWindow()) {
         let defaultWorkspacePath;
@@ -105,14 +171,14 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     }
     async showSaveConfirm(fileNamesOrResources) {
         if (this.skipDialogs()) {
-            this.logService.trace('FileDialogService: refused to show save confirmation dialog in tests.');
+            this.logService.trace("FileDialogService: refused to show save confirmation dialog in tests.");
             return ConfirmResult.DONT_SAVE;
         }
         return this.doShowSaveConfirm(fileNamesOrResources);
     }
     skipDialogs() {
         if (this.environmentService.enableSmokeTestDriver) {
-            this.logService.warn('DialogService: Dialog requested during smoke test.');
+            this.logService.warn("DialogService: Dialog requested during smoke test.");
         }
         return this.environmentService.isExtensionDevelopment && !!this.environmentService.extensionTestsLocationURI;
     }
@@ -121,38 +187,34 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             return ConfirmResult.DONT_SAVE;
         }
         let message;
-        let detail = ( localize(13840, "Your changes will be lost if you don't save them."));
+        let detail = ( localize(14227, "Your changes will be lost if you don't save them."));
         if (fileNamesOrResources.length === 1) {
             message = ( localize(
-                13841,
+                14228,
                 "Do you want to save the changes you made to {0}?",
-                typeof fileNamesOrResources[0] === 'string' ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
+                typeof fileNamesOrResources[0] === "string" ? fileNamesOrResources[0] : basename(fileNamesOrResources[0])
             ));
-        }
-        else {
+        } else {
             message = ( localize(
-                13842,
+                14229,
                 "Do you want to save the changes to the following {0} files?",
                 fileNamesOrResources.length
             ));
-            detail = getFileNamesMessage(fileNamesOrResources) + '\n' + detail;
+            detail = getFileNamesMessage(fileNamesOrResources) + "\n" + detail;
         }
-        const { result } = await this.dialogService.prompt({
+        const {
+            result
+        } = await this.dialogService.prompt({
             type: Severity.Warning,
             message,
             detail,
-            buttons: [
-                {
-                    label: fileNamesOrResources.length > 1 ?
-                        ( localize(13843, "&&Save All")) :
-                        ( localize(13844, "&&Save")),
-                    run: () => ConfirmResult.SAVE
-                },
-                {
-                    label: ( localize(13845, "Do&&n't Save")),
-                    run: () => ConfirmResult.DONT_SAVE
-                }
-            ],
+            buttons: [{
+                label: fileNamesOrResources.length > 1 ? ( localize(14230, "&&Save All")) : ( localize(14231, "&&Save")),
+                run: () => ConfirmResult.SAVE
+            }, {
+                label: ( localize(14232, "Do&&n't Save")),
+                run: () => ConfirmResult.DONT_SAVE
+            }],
             cancelButton: {
                 run: () => ConfirmResult.CANCEL
             }
@@ -163,62 +225,135 @@ 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(13846, 'Open File or Folder'));
+        const title = ( localize(14233, "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 });
+        const uri = await this.pickResource({
+            canSelectFiles: true,
+            canSelectFolders: true,
+            canSelectMany: false,
+            defaultUri: options.defaultUri,
+            title,
+            availableFileSystems
+        });
         if (uri) {
             const stat = await this.fileService.stat(uri);
-            const toOpen = stat.isDirectory ? { folderUri: uri } : { fileUri: uri };
+            const toOpen = stat.isDirectory ? {
+                folderUri: uri
+            } : {
+                fileUri: uri
+            };
             if (!isWorkspaceToOpen(toOpen) && isFileToOpen(toOpen)) {
                 this.addFileToRecentlyOpened(toOpen.fileUri);
             }
             if (stat.isDirectory || options.forceNewWindow || preferNewWindow) {
-                await this.hostService.openWindow([toOpen], { forceNewWindow: options.forceNewWindow, remoteAuthority: options.remoteAuthority });
-            }
-            else {
-                await this.editorService.openEditors([{ resource: uri, options: { source: EditorOpenSource.USER, pinned: true } }], undefined, { validateTrust: true });
+                await this.hostService.openWindow([toOpen], {
+                    forceNewWindow: options.forceNewWindow,
+                    remoteAuthority: options.remoteAuthority
+                });
+            } else {
+                await this.editorService.openEditors([{
+                    resource: uri,
+                    options: {
+                        source: EditorOpenSource.USER,
+                        pinned: true
+                    }
+                }], undefined, {
+                    validateTrust: true
+                });
             }
         }
     }
     async pickFileAndOpenSimplified(schema, options, preferNewWindow) {
-        const title = ( localize(13847, 'Open File'));
+        const title = ( localize(14234, "Open File"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema);
-        const uri = await this.pickResource({ canSelectFiles: true, canSelectFolders: false, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+        const uri = await this.pickResource({
+            canSelectFiles: true,
+            canSelectFolders: false,
+            canSelectMany: false,
+            defaultUri: options.defaultUri,
+            title,
+            availableFileSystems
+        });
         if (uri) {
             this.addFileToRecentlyOpened(uri);
             if (options.forceNewWindow || preferNewWindow) {
-                await this.hostService.openWindow([{ fileUri: uri }], { forceNewWindow: options.forceNewWindow, remoteAuthority: options.remoteAuthority });
-            }
-            else {
-                await this.editorService.openEditors([{ resource: uri, options: { source: EditorOpenSource.USER, pinned: true } }], undefined, { validateTrust: true });
+                await this.hostService.openWindow([{
+                    fileUri: uri
+                }], {
+                    forceNewWindow: options.forceNewWindow,
+                    remoteAuthority: options.remoteAuthority
+                });
+            } else {
+                await this.editorService.openEditors([{
+                    resource: uri,
+                    options: {
+                        source: EditorOpenSource.USER,
+                        pinned: true
+                    }
+                }], undefined, {
+                    validateTrust: true
+                });
             }
         }
     }
     addFileToRecentlyOpened(uri) {
-        this.workspacesService.addRecentlyOpened([{ fileUri: uri, label: this.labelService.getUriLabel(uri, { appendWorkspaceSuffix: true }) }]);
+        this.workspacesService.addRecentlyOpened([{
+            fileUri: uri,
+            label: this.labelService.getUriLabel(uri, {
+                appendWorkspaceSuffix: true
+            })
+        }]);
     }
     async pickFolderAndOpenSimplified(schema, options) {
-        const title = ( localize(13848, 'Open Folder'));
+        const title = ( localize(14235, "Open Folder"));
         const availableFileSystems = this.addFileSchemaIfNeeded(schema, true);
-        const uri = await this.pickResource({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false, defaultUri: options.defaultUri, title, availableFileSystems });
+        const uri = await this.pickResource({
+            canSelectFiles: false,
+            canSelectFolders: true,
+            canSelectMany: false,
+            defaultUri: options.defaultUri,
+            title,
+            availableFileSystems
+        });
         if (uri) {
-            return this.hostService.openWindow([{ folderUri: uri }], { forceNewWindow: options.forceNewWindow, remoteAuthority: options.remoteAuthority });
+            return this.hostService.openWindow([{
+                folderUri: uri
+            }], {
+                forceNewWindow: options.forceNewWindow,
+                remoteAuthority: options.remoteAuthority
+            });
         }
     }
     async pickWorkspaceAndOpenSimplified(schema, options) {
-        const title = ( localize(13849, 'Open Workspace from File'));
-        const filters = [{ name: ( localize(13850, 'Workspace')), extensions: [WORKSPACE_EXTENSION] }];
+        const title = ( localize(14236, "Open Workspace from File"));
+        const filters = [{
+            name: ( localize(14237, "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 });
+        const uri = await this.pickResource({
+            canSelectFiles: true,
+            canSelectFolders: false,
+            canSelectMany: false,
+            defaultUri: options.defaultUri,
+            title,
+            filters,
+            availableFileSystems
+        });
         if (uri) {
-            return this.hostService.openWindow([{ workspaceUri: uri }], { forceNewWindow: options.forceNewWindow, remoteAuthority: options.remoteAuthority });
+            return this.hostService.openWindow([{
+                workspaceUri: uri
+            }], {
+                forceNewWindow: options.forceNewWindow,
+                remoteAuthority: options.remoteAuthority
+            });
         }
     }
     async pickFileToSaveSimplified(schema, options) {
         if (!options.availableFileSystems) {
             options.availableFileSystems = this.addFileSchemaIfNeeded(schema);
         }
-        options.title = ( localize(13851, 'Save As'));
+        options.title = ( localize(14238, "Save As"));
         const uri = await this.saveRemoteResource(options);
         if (uri) {
             this.addFileToRecentlyOpened(uri);
@@ -269,22 +404,30 @@ let AbstractFileDialogService = class AbstractFileDialogService {
     getPickFileToSaveDialogOptions(defaultUri, availableFileSystems) {
         const options = {
             defaultUri,
-            title: ( localize(13852, "Save As")),
+            title: ( localize(14239, "Save As")),
             availableFileSystems
         };
         const ext = defaultUri ? extname(defaultUri) : undefined;
         let matchingFilter;
         const registeredLanguageNames = this.languageService.getSortedRegisteredLanguageNames();
-        const registeredLanguageFilters = coalesce(( registeredLanguageNames.map(({ languageName, languageId }) => {
+        const registeredLanguageFilters = coalesce(( registeredLanguageNames.map((
+            {
+                languageName,
+                languageId
+            }
+        ) => {
             const extensions = this.languageService.getExtensions(languageId);
             if (!extensions.length) {
                 return null;
             }
-            const filter = { name: languageName, extensions: ( distinct(extensions).slice(0, 10).map(e => trim(e, '.'))) };
+            const filter = {
+                name: languageName,
+                extensions: ( distinct(extensions).slice(0, 10).map(e => trim(e, ".")))
+            };
             const extOrPlaintext = ext || PLAINTEXT_EXTENSION;
             if (!matchingFilter && extensions.includes(extOrPlaintext)) {
                 matchingFilter = filter;
-                const trimmedExt = trim(extOrPlaintext, '.');
+                const trimmedExt = trim(extOrPlaintext, ".");
                 if (!filter.extensions.includes(trimmedExt)) {
                     filter.extensions.unshift(trimmedExt);
                 }
@@ -293,35 +436,21 @@ let AbstractFileDialogService = class AbstractFileDialogService {
             return filter;
         })));
         if (!matchingFilter && ext) {
-            matchingFilter = { name: trim(ext, '.').toUpperCase(), extensions: [trim(ext, '.')] };
+            matchingFilter = {
+                name: trim(ext, ".").toUpperCase(),
+                extensions: [trim(ext, ".")]
+            };
         }
-        options.filters = coalesce([
-            { name: ( localize(13853, "All Files")), extensions: ['*'] },
-            matchingFilter,
-            ...registeredLanguageFilters,
-            { name: ( localize(13854, "No Extension")), extensions: [''] }
-        ]);
+        options.filters = coalesce([{
+            name: ( localize(14240, "All Files")),
+            extensions: ["*"]
+        }, matchingFilter, ...registeredLanguageFilters, {
+            name: ( localize(14241, "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))], AbstractFileDialogService));
 
 export { AbstractFileDialogService };