@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -1,17 +1,16 @@
 import { localize } from '../../../../nls.js';
-import { SaveReason, EditorInputCapabilities, EditorResourceAccessor, SideBySideEditor, EditorsOrder } from '../../../common/editor.js';
+import { EditorResourceAccessor, SideBySideEditor } 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 { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
-import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { KeyMod as KeyMod$1, KeyCode, KeyChord } from '../../../../base/common/keyCodes.js';
+import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { 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 { 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 { isEqual } from '../../../../base/common/resources.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
@@ -33,7 +32,7 @@ async function saveSelectedEditors(accessor, options) {
         if (activeGroup.activeEditor) {
             editors = [];
             if (activeGroup.activeEditor instanceof SideBySideEditorInput &&
-                !options?.saveAs && !(activeGroup.activeEditor.primary.hasCapability(EditorInputCapabilities.Untitled) || activeGroup.activeEditor.secondary.hasCapability(EditorInputCapabilities.Untitled)) &&
+                !options?.saveAs && !(activeGroup.activeEditor.primary.hasCapability(4 ) || activeGroup.activeEditor.secondary.hasCapability(4 )) &&
                 activeGroup.activeEditor.secondary.isModified()) {
                 editors.push({ groupId: activeGroup.id, editor: activeGroup.activeEditor.primary });
                 editors.push({ groupId: activeGroup.id, editor: activeGroup.activeEditor.secondary });
@@ -63,7 +62,7 @@ async function saveSelectedEditors(accessor, options) {
 function saveDirtyEditorsOfGroups(accessor, groups, options) {
     const dirtyEditors = [];
     for (const group of groups) {
-        for (const editor of group.getEditors(EditorsOrder.MOST_RECENTLY_ACTIVE)) {
+        for (const editor of group.getEditors(0 )) {
             if (editor.isDirty()) {
                 dirtyEditors.push({ groupId: group.id, editor });
             }
@@ -80,16 +79,16 @@ async function doSaveEditors(accessor, editors, options) {
     }
     catch (error) {
         if (!isCancellationError(error)) {
-            const actions = [toAction({ id: 'workbench.action.files.saveEditors', label: ( localize(3720, "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) })];
-            const editorsToRevert = editors.filter(({ editor }) => !editor.hasCapability(EditorInputCapabilities.Untitled) );
+            const actions = [toAction({ id: 'workbench.action.files.saveEditors', label: ( localize(3749, "Retry")), run: () => instantiationService.invokeFunction(accessor => doSaveEditors(accessor, editors, options)) })];
+            const editorsToRevert = editors.filter(({ editor }) => !editor.hasCapability(4 ) );
             if (editorsToRevert.length > 0) {
-                actions.push(toAction({ id: 'workbench.action.files.revertEditors', label: editorsToRevert.length > 1 ? ( localize(3721, "Revert All")) : ( localize(3722, "Revert")), run: () => editorService.revert(editorsToRevert) }));
+                actions.push(toAction({ id: 'workbench.action.files.revertEditors', label: editorsToRevert.length > 1 ? ( localize(3750, "Revert All")) : ( localize(3751, "Revert")), run: () => editorService.revert(editorsToRevert) }));
             }
             notificationService.notify({
                 id: ( (editors.map(({ editor }) => hash(editor.resource?.toString())))).join(),
                 severity: Severity$1.Error,
                 message: ( localize(
-                    3723,
+                    3752,
                     "Failed to save '{0}': {1}",
                     ( (editors.map(({ editor }) => editor.getName()))).join(', '),
                     toErrorMessage(error, false)
@@ -101,41 +100,41 @@ async function doSaveEditors(accessor, editors, options) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     when: undefined,
-    weight: KeybindingWeight.WorkbenchContrib,
-    primary: KeyMod$1.CtrlCmd | KeyCode.KeyS,
+    weight: 200 ,
+    primary: 2048  | 49 ,
     id: SAVE_FILE_COMMAND_ID,
     handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: SaveReason.EXPLICIT, force: true  });
+        return saveSelectedEditors(accessor, { reason: 1 , force: true  });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     when: undefined,
-    weight: KeybindingWeight.WorkbenchContrib,
-    primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyS),
-    win: { primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyS) },
+    weight: 200 ,
+    primary: KeyChord(2048  | 41 , 49 ),
+    win: { primary: KeyChord(2048  | 41 , 2048  | 1024  | 49 ) },
     id: SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID,
     handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: SaveReason.EXPLICIT, force: true , skipSaveParticipants: true });
+        return saveSelectedEditors(accessor, { reason: 1 , force: true , skipSaveParticipants: true });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: SAVE_FILE_AS_COMMAND_ID,
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: undefined,
-    primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyS,
+    primary: 2048  | 1024  | 49 ,
     handler: accessor => {
-        return saveSelectedEditors(accessor, { reason: SaveReason.EXPLICIT, saveAs: true });
+        return saveSelectedEditors(accessor, { reason: 1 , saveAs: true });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     when: undefined,
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     primary: undefined,
-    mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Alt | KeyCode.KeyS },
-    win: { primary: KeyChord(KeyMod$1.CtrlCmd | KeyCode.KeyK, KeyCode.KeyS) },
+    mac: { primary: 2048  | 512  | 49  },
+    win: { primary: KeyChord(2048  | 41 , 49 ) },
     id: SAVE_ALL_COMMAND_ID,
     handler: accessor => {
-        return saveDirtyEditorsOfGroups(accessor, accessor.get(IEditorGroupsService).getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE), { reason: SaveReason.EXPLICIT });
+        return saveDirtyEditorsOfGroups(accessor, accessor.get(IEditorGroupsService).getGroups(1 ), { reason: 1  });
     }
 });
 CommandsRegistry.registerCommand({
@@ -145,19 +144,19 @@ CommandsRegistry.registerCommand({
         const resolvedContext = resolveCommandsContext([editorContext], accessor.get(IEditorService), editorGroupsService, accessor.get(IListService));
         let groups = undefined;
         if (!resolvedContext.groupedEditors.length) {
-            groups = editorGroupsService.getGroups(GroupsOrder.MOST_RECENTLY_ACTIVE);
+            groups = editorGroupsService.getGroups(1 );
         }
         else {
             groups = ( (resolvedContext.groupedEditors.map(({ group }) => group)));
         }
-        return saveDirtyEditorsOfGroups(accessor, groups, { reason: SaveReason.EXPLICIT });
+        return saveDirtyEditorsOfGroups(accessor, groups, { reason: 1  });
     }
 });
 CommandsRegistry.registerCommand({
     id: SAVE_FILES_COMMAND_ID,
     handler: async (accessor) => {
         const editorService = accessor.get(IEditorService);
-        const res = await editorService.saveAll({ includeUntitled: false, reason: SaveReason.EXPLICIT });
+        const res = await editorService.saveAll({ includeUntitled: false, reason: 1  });
         return res.success;
     }
 });
@@ -177,12 +176,12 @@ CommandsRegistry.registerCommand({
             return;
         }
         try {
-            await editorService.revert(editors.filter(({ editor }) => !editor.hasCapability(EditorInputCapabilities.Untitled) ), { force: true });
+            await editorService.revert(editors.filter(({ editor }) => !editor.hasCapability(4 ) ), { force: true });
         }
         catch (error) {
             const notificationService = accessor.get(INotificationService);
             notificationService.error(( localize(
-                3724,
+                3753,
                 "Failed to revert '{0}': {1}",
                 ( (editors.map(({ editor }) => editor.getName()))).join(', '),
                 toErrorMessage(error, false)

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

@@ -11,13 +11,13 @@ 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 = ( localize2(5358, "Save As..."));
+const SAVE_FILE_AS_LABEL = ( localize2(5405, "Save As..."));
 const SAVE_FILE_COMMAND_ID = 'workbench.action.files.save';
-const SAVE_FILE_LABEL = ( localize2(5359, "Save"));
+const SAVE_FILE_LABEL = ( localize2(5406, "Save"));
 const SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID = 'workbench.action.files.saveWithoutFormatting';
-const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2(5360, "Save without Formatting"));
+const SAVE_FILE_WITHOUT_FORMATTING_LABEL = ( localize2(5407, "Save without Formatting"));
 const SAVE_ALL_COMMAND_ID = 'saveAll';
-const SAVE_ALL_LABEL = ( localize2(5361, "Save All"));
+const SAVE_ALL_LABEL = ( localize2(5408, "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)));
@@ -26,12 +26,12 @@ const OpenEditorsReadonlyEditorContext = ( (new RawContextKey('readonlyEditorFoc
 const OpenEditorsSelectedFileOrUntitledContext = ( (new RawContextKey('openEditorsSelectedFileOrUntitled', true)));
 const ResourceSelectedForCompareContext = ( (new RawContextKey('resourceSelectedForCompare', false)));
 const REMOVE_ROOT_FOLDER_COMMAND_ID = 'removeRootFolder';
-const REMOVE_ROOT_FOLDER_LABEL = ( localize(5362, "Remove Folder from Workspace"));
+const REMOVE_ROOT_FOLDER_LABEL = ( localize(5409, "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 = ( localize2(5363, "New Untitled Text File"));
+const NEW_UNTITLED_FILE_LABEL = ( localize2(5410, "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, 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

@@ -3,14 +3,13 @@ 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';
-import { ByteSize, FileSystemProviderCapabilities } from '../../../../platform/files/common/files.js';
+import { ByteSize } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
-import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { IExplorerService } from './files.service.js';
-import { VIEW_ID, UndoConfirmLevel } from '../common/files.js';
+import { VIEW_ID } from '../common/files.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { Promises, RunOnceWorker, Limiter } from '../../../../base/common/async.js';
 import { VSBuffer, newWriteableBufferStream } from '../../../../base/common/buffer.js';
@@ -35,7 +34,6 @@ import { canceled } from '../../../../base/common/errors.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { WebFileSystemAccess } from '../../../../platform/files/browser/webFileSystemAccess.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 var BrowserFileUpload_1, FileDownload_1;
@@ -52,10 +50,10 @@ let BrowserFileUpload = class BrowserFileUpload {
     upload(target, source) {
         const cts = ( (new CancellationTokenSource()));
         const uploadPromise = this.progressService.withProgress({
-            location: ProgressLocation.Window,
+            location: 10 ,
             delay: 800,
             cancellable: true,
-            title: ( localize(10106, "Uploading"))
+            title: ( localize(10155, "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;
@@ -110,8 +108,8 @@ let BrowserFileUpload = class BrowserFileUpload {
                         undefined,
                         { recursive: true, folder: target.getChild(entry.name)?.isDirectory }
                     )))], {
-                        undoLabel: ( localize(10107, "Overwrite {0}", entry.name)),
-                        progressLabel: ( localize(10108, "Overwriting {0}", entry.name)),
+                        undoLabel: ( localize(10156, "Overwrite {0}", entry.name)),
+                        progressLabel: ( localize(10157, "Overwriting {0}", entry.name)),
                     });
                     if (token.isCancellationRequested) {
                         return;
@@ -145,7 +143,7 @@ let BrowserFileUpload = class BrowserFileUpload {
                 }
                 else {
                     message = ( localize(
-                        10109,
+                        10158,
                         "{0} of {1} files ({2}/s)",
                         operation.filesUploaded,
                         operation.filesTotal,
@@ -155,7 +153,7 @@ let BrowserFileUpload = class BrowserFileUpload {
             }
             else {
                 message = ( localize(
-                    10110,
+                    10159,
                     "{0} ({1} of {2}, {3}/s)",
                     entry.name,
                     ByteSize.formatSize(fileBytesUploaded),
@@ -300,10 +298,10 @@ let ExternalFileImport = class ExternalFileImport {
     async import(target, source, targetWindow) {
         const cts = ( (new CancellationTokenSource()));
         const importPromise = this.progressService.withProgress({
-            location: ProgressLocation.Window,
+            location: 10 ,
             delay: 800,
             cancellable: true,
-            title: ( localize(10111, "Copying..."))
+            title: ( localize(10160, "Copying..."))
         }, async () => await this.doImport(target, source, targetWindow, cts.token), () => cts.dispose(true));
         this.progressService.withProgress({ location: VIEW_ID, delay: 500 }, () => importPromise);
         return importPromise;
@@ -327,8 +325,8 @@ let ExternalFileImport = class ExternalFileImport {
             const buttons = [
                 {
                     label: folders.length > 1 ?
-                        ( localize(10112, "&&Copy Folders")) :
-                        ( localize(10113, "&&Copy Folder")),
+                        ( localize(10161, "&&Copy Folders")) :
+                        ( localize(10162, "&&Copy Folder")),
                     run: () => ImportChoice.Copy
                 }
             ];
@@ -337,25 +335,25 @@ let ExternalFileImport = class ExternalFileImport {
             if (( (folders.some(folder => workspaceFolderSchemas.indexOf(folder.uri.scheme) >= 0)))) {
                 buttons.unshift({
                     label: folders.length > 1 ?
-                        ( localize(10114, "&&Add Folders to Workspace")) :
-                        ( localize(10115, "&&Add Folder to Workspace")),
+                        ( localize(10163, "&&Add Folders to Workspace")) :
+                        ( localize(10164, "&&Add Folder to Workspace")),
                     run: () => ImportChoice.Add
                 });
                 message = folders.length > 1 ?
                     ( localize(
-                        10116,
+                        10165,
                         "Do you want to copy the folders or add the folders to the workspace?"
                     )) :
                     ( localize(
-                        10117,
+                        10166,
                         "Do you want to copy '{0}' or add '{0}' as a folder to the workspace?",
                         basename(folders[0].uri)
                     ));
             }
             else {
                 message = folders.length > 1 ?
-                    ( localize(10118, "Are you sure to want to copy folders?")) :
-                    ( localize(10119, "Are you sure to want to copy '{0}'?", basename(folders[0].uri)));
+                    ( localize(10167, "Are you sure to want to copy folders?")) :
+                    ( localize(10168, "Are you sure to want to copy '{0}'?", basename(folders[0].uri)));
             }
             const { result } = await this.dialogService.prompt({
                 type: Severity$1.Info,
@@ -381,7 +379,7 @@ let ExternalFileImport = class ExternalFileImport {
                 return;
             }
             const targetNames = ( (new Set()));
-            const caseSensitive = this.fileService.hasCapability(target.resource, FileSystemProviderCapabilities.PathCaseSensitive);
+            const caseSensitive = this.fileService.hasCapability(target.resource, 1024 );
             if (targetStat.children) {
                 targetStat.children.forEach(child => {
                     targetNames.add(caseSensitive ? child.name : child.name.toLowerCase());
@@ -404,9 +402,9 @@ let ExternalFileImport = class ExternalFileImport {
             }))))));
             if (inaccessibleFileCount > 0) {
                 this.notificationService.error(inaccessibleFileCount > 1 ? ( localize(
-                    10120,
+                    10169,
                     "Some or all of the dropped files could not be accessed for import."
-                )) : ( localize(10121, "The dropped file could not be accessed for import.")));
+                )) : ( localize(10170, "The dropped file could not be accessed for import.")));
             }
             const resourceFileEdits = ( (resourcesFiltered.map(resource => {
                 const sourceFileName = basename(resource);
@@ -418,13 +416,13 @@ let ExternalFileImport = class ExternalFileImport {
             const undoLevel = this.configurationService.getValue().explorer.confirmUndo;
             await this.explorerService.applyBulkEdit(resourceFileEdits, {
                 undoLabel: resourcesFiltered.length === 1 ?
-                    ( localize(10122, "Import {0}", basename(resourcesFiltered[0]))) :
-                    ( localize(10123, "Import {0} resources", resourcesFiltered.length)),
+                    ( localize(10171, "Import {0}", basename(resourcesFiltered[0]))) :
+                    ( localize(10172, "Import {0} resources", resourcesFiltered.length)),
                 progressLabel: resourcesFiltered.length === 1 ?
-                    ( localize(10124, "Copying {0}", basename(resourcesFiltered[0]))) :
-                    ( localize(10125, "Copying {0} resources", resourcesFiltered.length)),
-                progressLocation: ProgressLocation.Window,
-                confirmBeforeUndo: undoLevel === UndoConfirmLevel.Verbose || undoLevel === UndoConfirmLevel.Default,
+                    ( localize(10173, "Copying {0}", basename(resourcesFiltered[0]))) :
+                    ( localize(10174, "Copying {0} resources", resourcesFiltered.length)),
+                progressLocation: 10 ,
+                confirmBeforeUndo: undoLevel === "verbose"  || undoLevel === "default" ,
             });
             const autoOpen = this.configurationService.getValue().explorer.autoOpenDroppedFile;
             if (autoOpen && resourceFileEdits.length === 1) {
@@ -463,10 +461,10 @@ let FileDownload = class FileDownload {
     download(source) {
         const cts = ( (new CancellationTokenSource()));
         const downloadPromise = this.progressService.withProgress({
-            location: ProgressLocation.Window,
+            location: 10 ,
             delay: 800,
             cancellable: isWeb,
-            title: ( localize(10126, "Downloading"))
+            title: ( localize(10175, "Downloading"))
         }, async (progress) => this.doDownload(source, progress, cts), () => cts.dispose(true));
         this.progressService.withProgress({ location: VIEW_ID, delay: 500 }, () => downloadPromise);
         return downloadPromise;
@@ -610,7 +608,7 @@ let FileDownload = class FileDownload {
             }
             else {
                 message = ( localize(
-                    10127,
+                    10176,
                     "{0} of {1} files ({2}/s)",
                     operation.filesDownloaded,
                     operation.filesTotal,
@@ -620,7 +618,7 @@ let FileDownload = class FileDownload {
         }
         else {
             message = ( localize(
-                10128,
+                10177,
                 "{0} ({1} of {2}, {3}/s)",
                 name,
                 ByteSize.formatSize(operation.fileBytesDownloaded),
@@ -633,7 +631,7 @@ let FileDownload = class FileDownload {
     async doDownloadNative(explorerItem, progress, cts) {
         progress.report({ message: explorerItem.name });
         let defaultUri;
-        const lastUsedDownloadPath = this.storageService.get(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, StorageScope.APPLICATION);
+        const lastUsedDownloadPath = this.storageService.get(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, -1 );
         if (lastUsedDownloadPath) {
             defaultUri = joinPath(URI.file(lastUsedDownloadPath), explorerItem.name);
         }
@@ -644,16 +642,16 @@ let FileDownload = class FileDownload {
         }
         const destination = await this.fileDialogService.showSaveDialog({
             availableFileSystems: [Schemas.file],
-            saveLabel: mnemonicButtonLabel(( localize(10129, "Download"))),
-            title: ( localize(10130, "Choose Where to Download")),
+            saveLabel: mnemonicButtonLabel(( localize(10178, "Download"))),
+            title: ( localize(10179, "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);
+            this.storageService.store(FileDownload_1.LAST_USED_DOWNLOAD_PATH_STORAGE_KEY, dirname(destination).fsPath, -1 , 1 );
             await this.explorerService.applyBulkEdit([( (new ResourceFileEdit(explorerItem.resource, destination, { overwrite: true, copy: true })))], {
-                undoLabel: ( localize(10131, "Download {0}", explorerItem.name)),
-                progressLabel: ( localize(10132, "Downloading {0}", explorerItem.name)),
-                progressLocation: ProgressLocation.Window
+                undoLabel: ( localize(10180, "Download {0}", explorerItem.name)),
+                progressLabel: ( localize(10181, "Downloading {0}", explorerItem.name)),
+                progressLocation: 10
             });
         }
         else {
@@ -672,12 +670,12 @@ FileDownload = FileDownload_1 = ( (__decorate([
 function getFileOverwriteConfirm(name) {
     return {
         message: ( localize(
-            10133,
+            10182,
             "A file or folder with the name '{0}' already exists in the destination folder. Do you want to replace it?",
             name
         )),
-        detail: ( localize(10134, "This action is irreversible!")),
-        primaryButton: ( localize(10135, "&&Replace")),
+        detail: ( localize(10183, "This action is irreversible!")),
+        primaryButton: ( localize(10184, "&&Replace")),
         type: 'warning'
     };
 }
@@ -685,12 +683,12 @@ function getMultipleFilesOverwriteConfirm(files) {
     if (files.length > 1) {
         return {
             message: ( localize(
-                10136,
+                10185,
                 "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' + ( localize(10134, "This action is irreversible!")),
-            primaryButton: ( localize(10135, "&&Replace")),
+            detail: getFileNamesMessage(files) + '\n' + ( localize(10183, "This action is irreversible!")),
+            primaryButton: ( localize(10184, "&&Replace")),
             type: 'warning'
         };
     }