@codingame/monaco-vscode-api 7.1.0 → 8.0.0

package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js

@@ -1,36 +1,33 @@
-import { toAction } from '../../../../base/common/actions.js';
-import { coalesce } from '../../../../base/common/arrays.js';
+import { localize } from '../../../../nls.js';
+import { SaveReason, EditorInputCapabilities, EditorResourceAccessor, SideBySideEditor, EditorsOrder } from '../../../common/editor.js';
+import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { toErrorMessage } from '../../../../base/common/errorMessage.js';
-import { isCancellationError } from '../../../../base/common/errors.js';
-import { hash } from '../../../../base/common/hash.js';
-import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
-import { isEqual } from '../../../../base/common/resources.js';
-import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
-import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
-import { localizeWithPath } from '../../../../nls.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { IListService } from '../../../../platform/list/browser/listService.service.js';
+import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
+import { getOpenEditorsViewMultiSelection } from './files.js';
+import { resolveCommandsContext } from '../../../browser/parts/editor/editorCommandsContext.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
-import { getMultiSelectedEditorContexts } from '../../../browser/parts/editor/editorCommands.js';
-import { SaveReason, EditorInputCapabilities, EditorResourceAccessor, SideBySideEditor, EditorsOrder } from '../../../common/editor.js';
-import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
-import { getOpenEditorsViewMultiSelection } from './files.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { GroupsOrder } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
-import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
+import { EmbeddedCodeEditorWidget } from '../../../../editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
-import { SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID } from './fileConstants.js';
+import { isCancellationError } from '../../../../base/common/errors.js';
+import { toAction } from '../../../../base/common/actions.js';
+import { hash } from '../../../../base/common/hash.js';
+import { SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID } from './fileConstants.js';
+import { IListService } from '../../../../platform/list/browser/listService.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
-const _moduleId = "vs/workbench/contrib/files/browser/fileCommands";
 async function saveSelectedEditors(accessor, options) {
-    const listService = accessor.get(IListService);
     const editorGroupService = accessor.get(IEditorGroupsService);
     const codeEditorService = accessor.get(ICodeEditorService);
     const textFileService = accessor.get(ITextFileService);
-    let editors = getOpenEditorsViewMultiSelection(listService);
+    let editors = getOpenEditorsViewMultiSelection(accessor);
     if (!editors) {
         const activeGroup = editorGroupService.activeGroup;
         if (activeGroup.activeEditor) {
@@ -86,17 +83,16 @@ async function doSaveEditors(accessor, editors, options) {
             notificationService.notify({
                 id: ( (editors.map(({ editor }) => hash(editor.resource?.toString())))).join(),
                 severity: Severity$1.Error,
-                message: ( localizeWithPath(
-                    _moduleId,
-                    3,
+                message: ( localize(
+                    3278,
                     "Failed to save '{0}': {1}",
                     ( (editors.map(({ editor }) => editor.getName()))).join(', '),
                     toErrorMessage(error, false)
                 )),
                 actions: {
                     primary: [
-                        toAction({ id: 'workbench.action.files.saveEditors', label: ( localizeWithPath(_moduleId, 4, "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
-                        toAction({ id: 'workbench.action.files.revertEditors', label: ( localizeWithPath(_moduleId, 5, "Discard")), run: () => editorService.revert(editors) })
+                        toAction({ id: 'workbench.action.files.saveEditors', label: ( localize(3279, "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) }),
+                        toAction({ id: 'workbench.action.files.revertEditors', label: ( localize(3280, "Discard")), run: () => editorService.revert(editors) })
                     ]
                 }
             });
@@ -145,14 +141,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 CommandsRegistry.registerCommand({
     id: SAVE_ALL_IN_GROUP_COMMAND_ID,
     handler: (accessor, _, editorContext) => {
-        const editorGroupService = accessor.get(IEditorGroupsService);
-        const contexts = getMultiSelectedEditorContexts(editorContext, accessor.get(IListService), accessor.get(IEditorGroupsService));
+        const editorGroupsService = accessor.get(IEditorGroupsService);
+        const resolvedContext = resolveCommandsContext([editorContext], accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
         let groups = undefined;
-        if (!contexts.length) {
-            groups = editorGroupService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
+        if (!resolvedContext.groupedEditors.length) {
+            groups = editorGroupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
         }
         else {
-            groups = coalesce(( (contexts.map(context => editorGroupService.getGroup(context.groupId)))));
+            groups = ( (resolvedContext.groupedEditors.map(({ group }) => group)));
         }
         return saveDirtyEditorsOfGroups(accessor, groups, { reason: SaveReason.EXPLICIT });
     }
@@ -165,3 +161,32 @@ CommandsRegistry.registerCommand({
         return res.success;
     }
 });
+CommandsRegistry.registerCommand({
+    id: REVERT_FILE_COMMAND_ID,
+    handler: async (accessor) => {
+        const editorGroupService = accessor.get(IEditorGroupsService);
+        const editorService = accessor.get(IEditorService);
+        let editors = getOpenEditorsViewMultiSelection(accessor);
+        if (!editors) {
+            const activeGroup = editorGroupService.activeGroup;
+            if (activeGroup.activeEditor) {
+                editors = [{ groupId: activeGroup.id, editor: activeGroup.activeEditor }];
+            }
+        }
+        if (!editors || editors.length === 0) {
+            return;
+        }
+        try {
+            await editorService.revert(editors.filter(({ editor }) => !editor.hasCapability(EditorInputCapabilities.Untitled) ), { force: true });
+        }
+        catch (error) {
+            const notificationService = accessor.get(INotificationService);
+            notificationService.error(( localize(
+                3281,
+                "Failed to revert '{0}': {1}",
+                ( (editors.map(({ editor }) => editor.getName()))).join(', '),
+                toErrorMessage(error, false)
+            )));
+        }
+    }
+});

package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js

@@ -1,6 +1,5 @@
-import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { localize2, localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const _moduleId = "vs/workbench/contrib/files/browser/fileConstants";
 const REVEAL_IN_EXPLORER_COMMAND_ID = 'revealInExplorer';
 const REVERT_FILE_COMMAND_ID = 'workbench.action.files.revert';
 const OPEN_TO_SIDE_COMMAND_ID = 'explorer.openToSide';
@@ -12,26 +11,27 @@ const COMPARE_WITH_SAVED_COMMAND_ID = 'workbench.files.action.compareWithSaved';
 const COPY_PATH_COMMAND_ID = 'copyFilePath';
 const COPY_RELATIVE_PATH_COMMAND_ID = 'copyRelativeFilePath';
 const SAVE_FILE_AS_COMMAND_ID = 'workbench.action.files.saveAs';
-const SAVE_FILE_AS_LABEL = ( localize2WithPath(_moduleId, 0, "Save As..."));
+const SAVE_FILE_AS_LABEL = ( localize2(5342, "Save As..."));
 const SAVE_FILE_COMMAND_ID = 'workbench.action.files.save';
-const SAVE_FILE_LABEL = ( localize2WithPath(_moduleId, 1, "Save"));
+const SAVE_FILE_LABEL = ( localize2(5343, "Save"));
 const SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID = 'workbench.action.files.saveWithoutFormatting';
-const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2WithPath(_moduleId, 2, "Save without Formatting"));
+const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2(5344, "Save without Formatting"));
 const SAVE_ALL_COMMAND_ID = 'saveAll';
-const SAVE_ALL_LABEL = ( localize2WithPath(_moduleId, 3, "Save All"));
+const SAVE_ALL_LABEL = ( localize2(5345, "Save All"));
 const SAVE_ALL_IN_GROUP_COMMAND_ID = 'workbench.files.action.saveAllInGroup';
 const SAVE_FILES_COMMAND_ID = 'workbench.action.files.saveFiles';
 const OpenEditorsGroupContext = ( (new RawContextKey('groupFocusedInOpenEditors', false)));
 const OpenEditorsDirtyEditorContext = ( (new RawContextKey('dirtyEditorFocusedInOpenEditors', false)));
 const OpenEditorsReadonlyEditorContext = ( (new RawContextKey('readonlyEditorFocusedInOpenEditors', false)));
+const OpenEditorsSelectedFileOrUntitledContext = ( (new RawContextKey('openEditorsSelectedFileOrUntitled', true)));
 const ResourceSelectedForCompareContext = ( (new RawContextKey('resourceSelectedForCompare', false)));
 const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder';
-const REMOVE_ROOT_FOLDER_LABEL = ( localizeWithPath(_moduleId, 4, "Remove Folder from Workspace"));
+const REMOVE_ROOT_FOLDER_LABEL = ( localize(5346, "Remove Folder from Workspace"));
 const PREVIOUS_COMPRESSED_FOLDER = 'previousCompressedFolder';
 const NEXT_COMPRESSED_FOLDER = 'nextCompressedFolder';
 const FIRST_COMPRESSED_FOLDER = 'firstCompressedFolder';
 const LAST_COMPRESSED_FOLDER = 'lastCompressedFolder';
 const NEW_UNTITLED_FILE_COMMAND_ID = 'workbench.action.files.newUntitledFile';
-const NEW_UNTITLED_FILE_LABEL = ( localize2WithPath(_moduleId, 5, "New Untitled Text File"));
+const NEW_UNTITLED_FILE_LABEL = ( localize2(5347, "New Untitled Text File"));
 const NEW_FILE_COMMAND_ID = 'workbench.action.files.newFile';
-export { COMPARE_RESOURCE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_FILE_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEXT_COMPRESSED_FOLDER, OPEN_TO_SIDE_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, PREVIOUS_COMPRESSED_FOLDER, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, REVEAL_IN_EXPLORER_COMMAND_ID, REVERT_FILE_COMMAND_ID, ResourceSelectedForCompareContext, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_ALL_LABEL, SAVE_FILES_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SELECT_FOR_COMPARE_COMMAND_ID };
+export { COMPARE_RESOURCE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, FIRST_COMPRESSED_FOLDER, LAST_COMPRESSED_FOLDER, NEW_FILE_COMMAND_ID, NEW_UNTITLED_FILE_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEXT_COMPRESSED_FOLDER, OPEN_TO_SIDE_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, OpenEditorsSelectedFileOrUntitledContext, PREVIOUS_COMPRESSED_FOLDER, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, REVEAL_IN_EXPLORER_COMMAND_ID, REVERT_FILE_COMMAND_ID, ResourceSelectedForCompareContext, SAVE_ALL_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_ALL_LABEL, SAVE_FILES_COMMAND_ID, SAVE_FILE_AS_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SELECT_FOR_COMPARE_COMMAND_ID };

package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { getFileNamesMessage } from '../../../../platform/dialogs/common/dialogs.js';
 import { IDialogService, IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
@@ -39,7 +39,6 @@ import { StorageScope, StorageTarget } from '../../../../platform/storage/common
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var BrowserFileUpload_1, FileDownload_1;
-const _moduleId = "vs/workbench/contrib/files/browser/fileImportExport";
 let BrowserFileUpload = class BrowserFileUpload {
     static { BrowserFileUpload_1 = this; }
     static { this.MAX_PARALLEL_UPLOADS = 20; }
@@ -56,7 +55,7 @@ let BrowserFileUpload = class BrowserFileUpload {
             location: ProgressLocation.Window,
             delay: 800,
             cancellable: true,
-            title: ( localizeWithPath(_moduleId, 0, "Uploading"))
+            title: ( localize(10007, "Uploading"))
         }, async (progress) => this.doUpload(target, this.toTransfer(source), progress, cts.token), () => cts.dispose(true));
         this.progressService.withProgress({ location: VIEW_ID, delay: 500 }, () => uploadPromise);
         return uploadPromise;
@@ -111,8 +110,8 @@ let BrowserFileUpload = class BrowserFileUpload {
                         undefined,
                         { recursive: true, folder: target.getChild(entry.name)?.isDirectory }
                     )))], {
-                        undoLabel: ( localizeWithPath(_moduleId, 1, "Overwrite {0}", entry.name)),
-                        progressLabel: ( localizeWithPath(_moduleId, 2, "Overwriting {0}", entry.name)),
+                        undoLabel: ( localize(10008, "Overwrite {0}", entry.name)),
+                        progressLabel: ( localize(10009, "Overwriting {0}", entry.name)),
                     });
                     if (token.isCancellationRequested) {
                         return;
@@ -145,9 +144,8 @@ let BrowserFileUpload = class BrowserFileUpload {
                     message = `${entry.name}`;
                 }
                 else {
-                    message = ( localizeWithPath(
-                        _moduleId,
-                        3,
+                    message = ( localize(
+                        10010,
                         "{0} of {1} files ({2}/s)",
                         operation.filesUploaded,
                         operation.filesTotal,
@@ -156,9 +154,8 @@ let BrowserFileUpload = class BrowserFileUpload {
                 }
             }
             else {
-                message = ( localizeWithPath(
-                    _moduleId,
-                    4,
+                message = ( localize(
+                    10011,
                     "{0} ({1} of {2}, {3}/s)",
                     entry.name,
                     ByteSize.formatSize(fileBytesUploaded),
@@ -306,7 +303,7 @@ let ExternalFileImport = class ExternalFileImport {
             location: ProgressLocation.Window,
             delay: 800,
             cancellable: true,
-            title: ( localizeWithPath(_moduleId, 5, "Copying..."))
+            title: ( localize(10012, "Copying..."))
         }, async () => await this.doImport(target, source, targetWindow, cts.token), () => cts.dispose(true));
         this.progressService.withProgress({ location: VIEW_ID, delay: 500 }, () => importPromise);
         return importPromise;
@@ -330,8 +327,8 @@ let ExternalFileImport = class ExternalFileImport {
             const buttons = [
                 {
                     label: folders.length > 1 ?
-                        ( localizeWithPath(_moduleId, 6, "&&Copy Folders")) :
-                        ( localizeWithPath(_moduleId, 7, "&&Copy Folder")),
+                        ( localize(10013, "&&Copy Folders")) :
+                        ( localize(10014, "&&Copy Folder")),
                     run: () => ImportChoice.Copy
                 }
             ];
@@ -340,32 +337,25 @@ let ExternalFileImport = class ExternalFileImport {
             if (( (folders.some(folder => workspaceFolderSchemas.indexOf(folder.uri.scheme) >= 0)))) {
                 buttons.unshift({
                     label: folders.length > 1 ?
-                        ( localizeWithPath(_moduleId, 8, "&&Add Folders to Workspace")) :
-                        ( localizeWithPath(_moduleId, 9, "&&Add Folder to Workspace")),
+                        ( localize(10015, "&&Add Folders to Workspace")) :
+                        ( localize(10016, "&&Add Folder to Workspace")),
                     run: () => ImportChoice.Add
                 });
                 message = folders.length > 1 ?
-                    ( localizeWithPath(
-                        _moduleId,
-                        10,
+                    ( localize(
+                        10017,
                         "Do you want to copy the folders or add the folders to the workspace?"
                     )) :
-                    ( localizeWithPath(
-                        _moduleId,
-                        11,
+                    ( localize(
+                        10018,
                         "Do you want to copy '{0}' or add '{0}' as a folder to the workspace?",
                         basename(folders[0].uri)
                     ));
             }
             else {
                 message = folders.length > 1 ?
-                    ( localizeWithPath(_moduleId, 12, "Are you sure to want to copy folders?")) :
-                    ( localizeWithPath(
-                        _moduleId,
-                        13,
-                        "Are you sure to want to copy '{0}'?",
-                        basename(folders[0].uri)
-                    ));
+                    ( localize(10019, "Are you sure to want to copy folders?")) :
+                    ( localize(10020, "Are you sure to want to copy '{0}'?", basename(folders[0].uri)));
             }
             const { result } = await this.dialogService.prompt({
                 type: Severity$1.Info,
@@ -413,11 +403,10 @@ let ExternalFileImport = class ExternalFileImport {
                 return resource;
             }))))));
             if (inaccessibleFileCount > 0) {
-                this.notificationService.error(inaccessibleFileCount > 1 ? ( localizeWithPath(
-                    _moduleId,
-                    14,
+                this.notificationService.error(inaccessibleFileCount > 1 ? ( localize(
+                    10021,
                     "Some or all of the dropped files could not be accessed for import."
-                )) : ( localizeWithPath(_moduleId, 15, "The dropped file could not be accessed for import.")));
+                )) : ( localize(10022, "The dropped file could not be accessed for import.")));
             }
             const resourceFileEdits = ( (resourcesFiltered.map(resource => {
                 const sourceFileName = basename(resource);
@@ -429,15 +418,16 @@ let ExternalFileImport = class ExternalFileImport {
             const undoLevel = this.configurationService.getValue().explorer.confirmUndo;
             await this.explorerService.applyBulkEdit(resourceFileEdits, {
                 undoLabel: resourcesFiltered.length === 1 ?
-                    ( localizeWithPath(_moduleId, 16, "Import {0}", basename(resourcesFiltered[0]))) :
-                    ( localizeWithPath(_moduleId, 17, "Import {0} resources", resourcesFiltered.length)),
+                    ( localize(10023, "Import {0}", basename(resourcesFiltered[0]))) :
+                    ( localize(10024, "Import {0} resources", resourcesFiltered.length)),
                 progressLabel: resourcesFiltered.length === 1 ?
-                    ( localizeWithPath(_moduleId, 18, "Copying {0}", basename(resourcesFiltered[0]))) :
-                    ( localizeWithPath(_moduleId, 19, "Copying {0} resources", resourcesFiltered.length)),
+                    ( localize(10025, "Copying {0}", basename(resourcesFiltered[0]))) :
+                    ( localize(10026, "Copying {0} resources", resourcesFiltered.length)),
                 progressLocation: ProgressLocation.Window,
                 confirmBeforeUndo: undoLevel === UndoConfirmLevel.Verbose || undoLevel === UndoConfirmLevel.Default,
             });
-            if (resourceFileEdits.length === 1) {
+            const autoOpen = this.configurationService.getValue().explorer.autoOpenDroppedFile;
+            if (autoOpen && resourceFileEdits.length === 1) {
                 const item = this.explorerService.findClosest(resourceFileEdits[0].newResource);
                 if (item && !item.isDirectory) {
                     this.editorService.openEditor({ resource: item.resource, options: { pinned: true } });
@@ -476,7 +466,7 @@ let FileDownload = class FileDownload {
             location: ProgressLocation.Window,
             delay: 800,
             cancellable: isWeb,
-            title: ( localizeWithPath(_moduleId, 20, "Downloading"))
+            title: ( localize(10027, "Downloading"))
         }, async (progress) => this.doDownload(source, progress, cts), () => cts.dispose(true));
         this.progressService.withProgress({ location: VIEW_ID, delay: 500 }, () => downloadPromise);
         return downloadPromise;
@@ -619,9 +609,8 @@ let FileDownload = class FileDownload {
                 message = name;
             }
             else {
-                message = ( localizeWithPath(
-                    _moduleId,
-                    21,
+                message = ( localize(
+                    10028,
                     "{0} of {1} files ({2}/s)",
                     operation.filesDownloaded,
                     operation.filesTotal,
@@ -630,9 +619,8 @@ let FileDownload = class FileDownload {
             }
         }
         else {
-            message = ( localizeWithPath(
-                _moduleId,
-                22,
+            message = ( localize(
+                10029,
                 "{0} ({1} of {2}, {3}/s)",
                 name,
                 ByteSize.formatSize(operation.fileBytesDownloaded),
@@ -656,15 +644,15 @@ let FileDownload = class FileDownload {
         }
         const destination = await this.fileDialogService.showSaveDialog({
             availableFileSystems: [Schemas.file],
-            saveLabel: mnemonicButtonLabel(( localizeWithPath(_moduleId, 23, "Download"))),
-            title: ( localizeWithPath(_moduleId, 24, "Choose Where to Download")),
+            saveLabel: mnemonicButtonLabel(( localize(10030, "Download"))),
+            title: ( localize(10031, "Choose Where to Download")),
             defaultUri
         });
         if (destination) {
             this.storageService.store(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, dirname(destination).fsPath, StorageScope.APPLICATION, StorageTarget.MACHINE);
             await this.explorerService.applyBulkEdit([( (new ResourceFileEdit(explorerItem.resource, destination, { overwrite: true, copy: true })))], {
-                undoLabel: ( localizeWithPath(_moduleId, 25, "Download {0}", explorerItem.name)),
-                progressLabel: ( localizeWithPath(_moduleId, 26, "Downloading {0}", explorerItem.name)),
+                undoLabel: ( localize(10032, "Download {0}", explorerItem.name)),
+                progressLabel: ( localize(10033, "Downloading {0}", explorerItem.name)),
                 progressLocation: ProgressLocation.Window
             });
         }
@@ -683,28 +671,26 @@ FileDownload = FileDownload_1 = ( (__decorate([
 ], FileDownload)));
 function getFileOverwriteConfirm(name) {
     return {
-        message: ( localizeWithPath(
-            _moduleId,
-            27,
+        message: ( localize(
+            10034,
             "A file or folder with the name '{0}' already exists in the destination folder. Do you want to replace it?",
             name
         )),
-        detail: ( localizeWithPath(_moduleId, 28, "This action is irreversible!")),
-        primaryButton: ( localizeWithPath(_moduleId, 29, "&&Replace")),
+        detail: ( localize(10035, "This action is irreversible!")),
+        primaryButton: ( localize(10036, "&&Replace")),
         type: 'warning'
     };
 }
 function getMultipleFilesOverwriteConfirm(files) {
     if (files.length > 1) {
         return {
-            message: ( localizeWithPath(
-                _moduleId,
-                30,
+            message: ( localize(
+                10037,
                 "The following {0} files and/or folders already exist in the destination folder. Do you want to replace them?",
                 files.length
             )),
-            detail: getFileNamesMessage(files) + '\n' + ( localizeWithPath(_moduleId, 28, "This action is irreversible!")),
-            primaryButton: ( localizeWithPath(_moduleId, 29, "&&Replace")),
+            detail: getFileNamesMessage(files) + '\n' + ( localize(10037, "This action is irreversible!")),
+            primaryButton: ( localize(10037, "&&Replace")),
             type: 'warning'
         };
     }