@codingame/monaco-vscode-views-service-override 1.83.4 → 1.83.6

package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js

@@ -29,7 +29,11 @@ import { hash } from 'monaco-editor/esm/vs/base/common/hash.js';
 const CONFLICT_RESOLUTION_CONTEXT = 'saveConflictResolutionContext';
 const CONFLICT_RESOLUTION_SCHEME = 'conflictResolution';
 const LEARN_MORE_DIRTY_WRITE_IGNORE_KEY = 'learnMoreDirtyWriteError';
-const conflictEditorHelp = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'userGuide', "Use the actions in the editor tool bar to either undo your changes or overwrite the content of the file with your changes.");
+const conflictEditorHelp = ( localizeWithPath(
+    'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+    'userGuide',
+    "Use the actions in the editor tool bar to either undo your changes or overwrite the content of the file with your changes."
+));
 let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable {
     constructor(notificationService, textFileService, contextKeyService, editorService, textModelService, instantiationService, storageService) {
         super();
@@ -89,7 +93,12 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
                 secondaryActions.push(this.instantiationService.createInstance(DoNotShowResolveConflictLearnMoreAction));
             }
             else {
-                message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'staleSaveError', "Failed to save '{0}': The content of the file is newer. Please compare your version with the file contents or overwrite the content of the file with your changes.", basename(resource));
+                message = ( localizeWithPath(
+                    'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                    'staleSaveError',
+                    "Failed to save '{0}': The content of the file is newer. Please compare your version with the file contents or overwrite the content of the file with your changes.",
+                    basename(resource)
+                ));
                 primaryActions.push(this.instantiationService.createInstance(ResolveSaveConflictAction, model));
                 primaryActions.push(this.instantiationService.createInstance(SaveModelIgnoreModifiedSinceAction, model));
                 secondaryActions.push(this.instantiationService.createInstance(ConfigureSaveConflictAction));
@@ -113,17 +122,48 @@ let TextFileSaveErrorHandler = class TextFileSaveErrorHandler extends Disposable
             primaryActions.push(this.instantiationService.createInstance(DiscardModelAction, model));
             if (isWriteLocked) {
                 if (triedToUnlock && canSaveElevated) {
-                    message = isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'readonlySaveErrorAdmin', "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.", basename(resource)) : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'readonlySaveErrorSudo', "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.", basename(resource));
+                    message = isWindows ? ( localizeWithPath(
+                        'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                        'readonlySaveErrorAdmin',
+                        "Failed to save '{0}': File is read-only. Select 'Overwrite as Admin' to retry as administrator.",
+                        basename(resource)
+                    )) : ( localizeWithPath(
+                        'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                        'readonlySaveErrorSudo',
+                        "Failed to save '{0}': File is read-only. Select 'Overwrite as Sudo' to retry as superuser.",
+                        basename(resource)
+                    ));
                 }
                 else {
-                    message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'readonlySaveError', "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.", basename(resource));
+                    message = ( localizeWithPath(
+                        'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                        'readonlySaveError',
+                        "Failed to save '{0}': File is read-only. Select 'Overwrite' to attempt to make it writeable.",
+                        basename(resource)
+                    ));
                 }
             }
             else if (canSaveElevated && isPermissionDenied) {
-                message = isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'permissionDeniedSaveError', "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.", basename(resource)) : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'permissionDeniedSaveErrorSudo', "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.", basename(resource));
+                message = isWindows ? ( localizeWithPath(
+                    'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                    'permissionDeniedSaveError',
+                    "Failed to save '{0}': Insufficient permissions. Select 'Retry as Admin' to retry as administrator.",
+                    basename(resource)
+                )) : ( localizeWithPath(
+                    'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                    'permissionDeniedSaveErrorSudo',
+                    "Failed to save '{0}': Insufficient permissions. Select 'Retry as Sudo' to retry as superuser.",
+                    basename(resource)
+                ));
             }
             else {
-                message = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] }, "Failed to save '{0}': {1}", basename(resource), toErrorMessage(error, false));
+                message = ( localizeWithPath(
+                    'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                    { key: 'genericSaveError', comment: ['{0} is the resource that failed to save and {1} the error message'] },
+                    "Failed to save '{0}': {1}",
+                    basename(resource),
+                    toErrorMessage(error, false)
+                ));
             }
         }
         const actions = { primary: primaryActions, secondary: secondaryActions };
@@ -152,7 +192,11 @@ TextFileSaveErrorHandler = ( __decorate([
 ], TextFileSaveErrorHandler));
 let ResolveConflictLearnMoreAction = class ResolveConflictLearnMoreAction extends Action {
     constructor(openerService) {
-        super('workbench.files.action.resolveConflictLearnMore', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'learnMore', "Learn More"));
+        super('workbench.files.action.resolveConflictLearnMore', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'learnMore',
+            "Learn More"
+        )));
         this.openerService = openerService;
     }
     async run() {
@@ -164,7 +208,11 @@ ResolveConflictLearnMoreAction = ( __decorate([
 ], ResolveConflictLearnMoreAction));
 let DoNotShowResolveConflictLearnMoreAction = class DoNotShowResolveConflictLearnMoreAction extends Action {
     constructor(storageService) {
-        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'dontShowAgain', "Don't Show Again"));
+        super('workbench.files.action.resolveConflictLearnMoreDoNotShowAgain', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'dontShowAgain',
+            "Don't Show Again"
+        )));
         this.storageService = storageService;
     }
     async run(notification) {
@@ -177,7 +225,11 @@ DoNotShowResolveConflictLearnMoreAction = ( __decorate([
 ], DoNotShowResolveConflictLearnMoreAction));
 let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
     constructor(model, editorService, notificationService, instantiationService, productService) {
-        super('workbench.files.action.resolveConflict', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'compareChanges', "Compare"));
+        super('workbench.files.action.resolveConflict', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'compareChanges',
+            "Compare"
+        )));
         this.model = model;
         this.editorService = editorService;
         this.notificationService = notificationService;
@@ -188,7 +240,14 @@ let ResolveSaveConflictAction = class ResolveSaveConflictAction extends Action {
         if (!this.model.isDisposed()) {
             const resource = this.model.resource;
             const name = basename(resource);
-            const editorLabel = localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'saveConflictDiffLabel', "{0} (in file) ↔ {1} (in {2}) - Resolve save conflict", name, name, this.productService.nameLong);
+            const editorLabel = ( localizeWithPath(
+                'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+                'saveConflictDiffLabel',
+                "{0} (in file) ↔ {1} (in {2}) - Resolve save conflict",
+                name,
+                name,
+                this.productService.nameLong
+            ));
             await TextFileContentProvider.open(resource, CONFLICT_RESOLUTION_SCHEME, editorLabel, this.editorService, { pinned: true });
             const actions = { primary: [this.instantiationService.createInstance(ResolveConflictLearnMoreAction)] };
             const handle = this.notificationService.notify({
@@ -210,7 +269,23 @@ ResolveSaveConflictAction = ( __decorate([
 ], ResolveSaveConflictAction));
 class SaveModelElevatedAction extends Action {
     constructor(model, triedToUnlock) {
-        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwriteElevated', "Overwrite as Admin...") : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwriteElevatedSudo', "Overwrite as Sudo...") : isWindows ? localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'saveElevated', "Retry as Admin...") : localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'saveElevatedSudo', "Retry as Sudo..."));
+        super('workbench.files.action.saveModelElevated', triedToUnlock ? isWindows ? ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'overwriteElevated',
+            "Overwrite as Admin..."
+        )) : ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'overwriteElevatedSudo',
+            "Overwrite as Sudo..."
+        )) : isWindows ? ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'saveElevated',
+            "Retry as Admin..."
+        )) : ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'saveElevatedSudo',
+            "Retry as Sudo..."
+        )));
         this.model = model;
         this.triedToUnlock = triedToUnlock;
     }
@@ -226,7 +301,11 @@ class SaveModelElevatedAction extends Action {
 }
 class RetrySaveModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.saveModel', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'retry', "Retry"));
+        super('workbench.files.action.saveModel', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'retry',
+            "Retry"
+        )));
         this.model = model;
     }
     async run() {
@@ -237,7 +316,11 @@ class RetrySaveModelAction extends Action {
 }
 class DiscardModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.discardModel', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'discard', "Discard"));
+        super('workbench.files.action.discardModel', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'discard',
+            "Discard"
+        )));
         this.model = model;
     }
     async run() {
@@ -280,7 +363,11 @@ SaveModelAsAction = ( __decorate([
 ], SaveModelAsAction));
 class UnlockModelAction extends Action {
     constructor(model) {
-        super('workbench.files.action.unlock', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwrite', "Overwrite"));
+        super('workbench.files.action.unlock', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'overwrite',
+            "Overwrite"
+        )));
         this.model = model;
     }
     async run() {
@@ -291,7 +378,11 @@ class UnlockModelAction extends Action {
 }
 class SaveModelIgnoreModifiedSinceAction extends Action {
     constructor(model) {
-        super('workbench.files.action.saveIgnoreModifiedSince', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'overwrite', "Overwrite"));
+        super('workbench.files.action.saveIgnoreModifiedSince', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'overwrite',
+            "Overwrite"
+        )));
         this.model = model;
     }
     async run() {
@@ -302,7 +393,11 @@ class SaveModelIgnoreModifiedSinceAction extends Action {
 }
 let ConfigureSaveConflictAction = class ConfigureSaveConflictAction extends Action {
     constructor(preferencesService) {
-        super('workbench.files.action.configureSaveConflict', localizeWithPath('vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler', 'configure', "Configure"));
+        super('workbench.files.action.configureSaveConflict', ( localizeWithPath(
+            'vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler',
+            'configure',
+            "Configure"
+        )));
         this.preferencesService = preferencesService;
     }
     async run() {

package/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js

@@ -3,16 +3,16 @@ import { GlobalCompareResourcesAction, FocusFilesExplorer, ShowActiveFileInExplo
 import { CONFLICT_RESOLUTION_CONTEXT } from './editors/textFileSaveErrorHandler.js';
 import { registerAction2, MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import './fileCommands.js';
-import { COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_AS_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_UNTITLED_FILE_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, COMPARE_RESOURCE_COMMAND_ID, ResourceSelectedForCompareContext, SELECT_FOR_COMPARE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL, SAVE_ALL_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
+import { COPY_PATH_COMMAND_ID, COPY_RELATIVE_PATH_COMMAND_ID, REVEAL_IN_EXPLORER_COMMAND_ID, SAVE_FILE_LABEL, SAVE_FILE_COMMAND_ID, SAVE_FILE_WITHOUT_FORMATTING_LABEL, SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, SAVE_ALL_IN_GROUP_COMMAND_ID, SAVE_FILES_COMMAND_ID, REVERT_FILE_COMMAND_ID, COMPARE_WITH_SAVED_COMMAND_ID, SAVE_FILE_AS_LABEL, SAVE_FILE_AS_COMMAND_ID, NEW_UNTITLED_FILE_LABEL, NEW_UNTITLED_FILE_COMMAND_ID, OPEN_TO_SIDE_COMMAND_ID, OpenEditorsDirtyEditorContext, OpenEditorsGroupContext, OpenEditorsReadonlyEditorContext, COMPARE_RESOURCE_COMMAND_ID, ResourceSelectedForCompareContext, SELECT_FOR_COMPARE_COMMAND_ID, COMPARE_SELECTED_COMMAND_ID, OPEN_WITH_EXPLORER_COMMAND_ID, REMOVE_ROOT_FOLDER_COMMAND_ID, REMOVE_ROOT_FOLDER_LABEL } from 'vscode/vscode/vs/workbench/contrib/files/browser/fileConstants';
 import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
-import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash, ExplorerResourceCut, ExplorerFolderContext, ExplorerResourceAvailableEditorIdsContext, FoldersViewVisibleContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
+import { FilesExplorerFocusCondition, ExplorerRootContext, ExplorerResourceNotReadonlyContext, ExplorerResourceMoveableToTrash, ExplorerResourceCut, ExplorerFolderContext, ExplorerResourceAvailableEditorIdsContext } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { ADD_ROOT_FOLDER_COMMAND_ID, ADD_ROOT_FOLDER_LABEL } from 'vscode/vscode/vs/workbench/browser/actions/workspaceCommands';
 import { REOPEN_WITH_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { AutoSaveAfterShortDelayContext } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { WorkbenchListDoubleSelection } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { ResourceContextKey, WorkspaceFolderCountContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, HasWebFileSystemAccess, EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext, ActiveEditorContext, SidebarFocusContext, ActiveEditorCanRevertContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { ResourceContextKey, WorkspaceFolderCountContext, ActiveEditorAvailableEditorIdsContext, DirtyWorkingCopiesContext, HasWebFileSystemAccess, EnterMultiRootWorkspaceSupportContext, WorkbenchStateContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IsWebContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
@@ -125,15 +125,27 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 const copyPathCommand = {
     id: COPY_PATH_COMMAND_ID,
-    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyPath', "Copy Path")
+    title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'copyPath',
+        "Copy Path"
+    ))
 };
 const copyRelativePathCommand = {
     id: COPY_RELATIVE_PATH_COMMAND_ID,
-    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyRelativePath', "Copy Relative Path")
+    title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'copyRelativePath',
+        "Copy Relative Path"
+    ))
 };
 appendEditorTitleContextMenuItem(COPY_PATH_COMMAND_ID, copyPathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste');
 appendEditorTitleContextMenuItem(COPY_RELATIVE_PATH_COMMAND_ID, copyRelativePathCommand.title, ResourceContextKey.IsFileSystemResource, '1_cutcopypaste');
-appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revealInSideBar', "Reveal in Explorer View"), ResourceContextKey.IsFileSystemResource, '2_files', 1);
+appendEditorTitleContextMenuItem(REVEAL_IN_EXPLORER_COMMAND_ID, ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'revealInSideBar',
+    "Reveal in Explorer View"
+)), ResourceContextKey.IsFileSystemResource, '2_files', 1);
 function appendEditorTitleContextMenuItem(id, title, when, group, order) {
     MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, {
         command: { id, title },
@@ -142,8 +154,16 @@ function appendEditorTitleContextMenuItem(id, title, when, group, order) {
         order
     });
 }
-appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'acceptLocalChanges', "Use your changes and overwrite file contents"), Codicon.check, -10);
-appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revertLocalChanges', "Discard your changes and revert to file contents"), Codicon.discard, -9);
+appendSaveConflictEditorTitleAction('workbench.files.action.acceptLocalChanges', ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'acceptLocalChanges',
+    "Use your changes and overwrite file contents"
+)), Codicon.check, -10);
+appendSaveConflictEditorTitleAction('workbench.files.action.revertLocalChanges', ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'revertLocalChanges',
+    "Discard your changes and revert to file contents"
+)), Codicon.discard, -9);
 function appendSaveConflictEditorTitleAction(id, title, icon, order, command) {
     MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
         command: { id, title, icon },
@@ -162,14 +182,38 @@ function appendToCommandPalette(id, title, category, when) {
         when
     });
 }
-appendToCommandPalette(COPY_PATH_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyPathOfActive', "Copy Path of Active File"), original: 'Copy Path of Active File' }, Categories.File);
-appendToCommandPalette(COPY_RELATIVE_PATH_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'copyRelativePathOfActive', "Copy Relative Path of Active File"), original: 'Copy Relative Path of Active File' }, Categories.File);
+appendToCommandPalette(COPY_PATH_COMMAND_ID, { value: ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'copyPathOfActive',
+    "Copy Path of Active File"
+)), original: 'Copy Path of Active File' }, Categories.File);
+appendToCommandPalette(COPY_RELATIVE_PATH_COMMAND_ID, { value: ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'copyRelativePathOfActive',
+    "Copy Relative Path of Active File"
+)), original: 'Copy Relative Path of Active File' }, Categories.File);
 appendToCommandPalette(SAVE_FILE_COMMAND_ID, { value: SAVE_FILE_LABEL, original: 'Save' }, Categories.File);
 appendToCommandPalette(SAVE_FILE_WITHOUT_FORMATTING_COMMAND_ID, { value: SAVE_FILE_WITHOUT_FORMATTING_LABEL, original: 'Save without Formatting' }, Categories.File);
-appendToCommandPalette(SAVE_ALL_IN_GROUP_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'saveAllInGroup', "Save All in Group"), original: 'Save All in Group' }, Categories.File);
-appendToCommandPalette(SAVE_FILES_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'saveFiles', "Save All Files"), original: 'Save All Files' }, Categories.File);
-appendToCommandPalette(REVERT_FILE_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revert', "Revert File"), original: 'Revert File' }, Categories.File);
-appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, { value: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareActiveWithSaved', "Compare Active File with Saved"), original: 'Compare Active File with Saved' }, Categories.File);
+appendToCommandPalette(SAVE_ALL_IN_GROUP_COMMAND_ID, { value: ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'saveAllInGroup',
+    "Save All in Group"
+)), original: 'Save All in Group' }, Categories.File);
+appendToCommandPalette(SAVE_FILES_COMMAND_ID, { value: ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'saveFiles',
+    "Save All Files"
+)), original: 'Save All Files' }, Categories.File);
+appendToCommandPalette(REVERT_FILE_COMMAND_ID, { value: ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'revert',
+    "Revert File"
+)), original: 'Revert File' }, Categories.File);
+appendToCommandPalette(COMPARE_WITH_SAVED_COMMAND_ID, { value: ( nls.localizeWithPath(
+    'vs/workbench/contrib/files/browser/fileActions.contribution',
+    'compareActiveWithSaved',
+    "Compare Active File with Saved"
+)), original: 'Compare Active File with Saved' }, Categories.File);
 appendToCommandPalette(SAVE_FILE_AS_COMMAND_ID, { value: SAVE_FILE_AS_LABEL, original: 'Save As...' }, Categories.File);
 appendToCommandPalette(NEW_FILE_COMMAND_ID, { value: NEW_FILE_LABEL, original: 'New File' }, Categories.File, ( WorkspaceFolderCountContext.notEqualsTo('0')));
 appendToCommandPalette(NEW_FOLDER_COMMAND_ID, { value: NEW_FOLDER_LABEL, original: 'New Folder' }, Categories.File, ( WorkspaceFolderCountContext.notEqualsTo('0')));
@@ -177,7 +221,11 @@ appendToCommandPalette(NEW_UNTITLED_FILE_COMMAND_ID, { value: NEW_UNTITLED_FILE_
 const isFileOrUntitledResourceContextKey = ( ContextKeyExpr.or(ResourceContextKey.IsFileSystemResource, ( ResourceContextKey.Scheme.isEqualTo(Schemas.untitled))));
 const openToSideCommand = {
     id: OPEN_TO_SIDE_COMMAND_ID,
-    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'openToSide', "Open to the Side")
+    title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'openToSide',
+        "Open to the Side"
+    ))
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: 'navigation',
@@ -190,7 +238,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 10,
     command: {
         id: REOPEN_WITH_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'reopenWith', "Reopen Editor With...")
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'reopenWith',
+            "Reopen Editor With..."
+        ))
     },
     when: ActiveEditorAvailableEditorIdsContext
 });
@@ -226,7 +278,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 20,
     command: {
         id: REVERT_FILE_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'revert', "Revert File"),
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'revert',
+            "Revert File"
+        )),
         precondition: OpenEditorsDirtyEditorContext
     },
     when: ( ContextKeyExpr.and((
@@ -240,7 +296,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 30,
     command: {
         id: SAVE_ALL_IN_GROUP_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'saveAll', "Save All"),
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'saveAll',
+            "Save All"
+        )),
         precondition: DirtyWorkingCopiesContext
     },
     when: OpenEditorsGroupContext
@@ -250,14 +310,22 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 10,
     command: {
         id: COMPARE_WITH_SAVED_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareWithSaved', "Compare with Saved"),
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'compareWithSaved',
+            "Compare with Saved"
+        )),
         precondition: OpenEditorsDirtyEditorContext
     },
     when: ( ContextKeyExpr.and(ResourceContextKey.IsFileSystemResource, ( AutoSaveAfterShortDelayContext.toNegated()), ( WorkbenchListDoubleSelection.toNegated())))
 });
 const compareResourceCommand = {
     id: COMPARE_RESOURCE_COMMAND_ID,
-    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareWithSelected', "Compare with Selected")
+    title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'compareWithSelected',
+        "Compare with Selected"
+    ))
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: '3_compare',
@@ -272,7 +340,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 });
 const selectForCompareCommand = {
     id: SELECT_FOR_COMPARE_COMMAND_ID,
-    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareSource', "Select for Compare")
+    title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'compareSource',
+        "Select for Compare"
+    ))
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: '3_compare',
@@ -286,7 +358,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
 });
 const compareSelectedCommand = {
     id: COMPARE_SELECTED_COMMAND_ID,
-    title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'compareSelected', "Compare Selected")
+    title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'compareSelected',
+        "Compare Selected"
+    ))
 };
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     group: '3_compare',
@@ -303,7 +379,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 10,
     command: {
         id: CLOSE_EDITOR_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'close', "Close")
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'close',
+            "Close"
+        ))
     },
     when: ( OpenEditorsGroupContext.toNegated())
 });
@@ -312,7 +392,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 20,
     command: {
         id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'closeOthers', "Close Others")
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'closeOthers',
+            "Close Others"
+        ))
     },
     when: ( OpenEditorsGroupContext.toNegated())
 });
@@ -321,7 +405,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 30,
     command: {
         id: CLOSE_SAVED_EDITORS_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'closeSaved', "Close Saved")
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'closeSaved',
+            "Close Saved"
+        ))
     }
 });
 MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
@@ -329,7 +417,11 @@ MenuRegistry.appendMenuItem(MenuId.OpenEditorsContext, {
     order: 40,
     command: {
         id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'closeAll', "Close All")
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'closeAll',
+            "Close All"
+        ))
     }
 });
 MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
@@ -363,7 +455,11 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     order: 20,
     command: {
         id: OPEN_WITH_EXPLORER_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'explorerOpenWith', "Open With..."),
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'explorerOpenWith',
+            "Open With..."
+        )),
     },
     when: ( ContextKeyExpr.and(( ExplorerFolderContext.toNegated()), ExplorerResourceAvailableEditorIdsContext)),
 });
@@ -390,7 +486,11 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     order: 8,
     command: {
         id: CUT_FILE_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'cut', "Cut")
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'cut',
+            "Cut"
+        ))
     },
     when: ( ContextKeyExpr.and(( ExplorerRootContext.toNegated()), ExplorerResourceNotReadonlyContext))
 });
@@ -487,7 +587,11 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     },
     alt: {
         id: DELETE_FILE_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'deleteFile', "Delete Permanently"),
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'deleteFile',
+            "Delete Permanently"
+        )),
         precondition: ExplorerResourceNotReadonlyContext
     },
     when: ( ContextKeyExpr.and(( ExplorerRootContext.toNegated()), ExplorerResourceMoveableToTrash))
@@ -497,84 +601,36 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerContext, {
     order: 20,
     command: {
         id: DELETE_FILE_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'deleteFile', "Delete Permanently"),
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            'deleteFile',
+            "Delete Permanently"
+        )),
         precondition: ExplorerResourceNotReadonlyContext
     },
     when: ( ContextKeyExpr.and(( ExplorerRootContext.toNegated()), ( ExplorerResourceMoveableToTrash.toNegated())))
 });
 for (const menuId of [MenuId.EmptyEditorGroupContext, MenuId.EditorTabsBarContext]) {
-    MenuRegistry.appendMenuItem(menuId, { command: { id: NEW_UNTITLED_FILE_COMMAND_ID, title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'newFile', "New Text File") }, group: '1_file', order: 10 });
-    MenuRegistry.appendMenuItem(menuId, { command: { id: 'workbench.action.quickOpen', title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', 'openFile', "Open File...") }, group: '1_file', order: 20 });
+    MenuRegistry.appendMenuItem(menuId, { command: { id: NEW_UNTITLED_FILE_COMMAND_ID, title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'newFile',
+        "New Text File"
+    )) }, group: '1_file', order: 10 });
+    MenuRegistry.appendMenuItem(menuId, { command: { id: 'workbench.action.quickOpen', title: ( nls.localizeWithPath(
+        'vs/workbench/contrib/files/browser/fileActions.contribution',
+        'openFile',
+        "Open File..."
+    )) }, group: '1_file', order: 20 });
 }
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    group: '1_new',
-    command: {
-        id: NEW_UNTITLED_FILE_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miNewFile', comment: ['&& denotes a mnemonic'] }, "&&New Text File")
-    },
-    order: 1
-}));
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    group: '4_save',
-    command: {
-        id: SAVE_FILE_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miSave', comment: ['&& denotes a mnemonic'] }, "&&Save"),
-        precondition: ( ContextKeyExpr.or(ActiveEditorContext, ( ContextKeyExpr.and(FoldersViewVisibleContext, SidebarFocusContext))))
-    },
-    order: 1
-}));
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    group: '4_save',
-    command: {
-        id: SAVE_FILE_AS_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miSaveAs', comment: ['&& denotes a mnemonic'] }, "Save &&As..."),
-        precondition: ( ContextKeyExpr.or(ActiveEditorContext, ( ContextKeyExpr.and(FoldersViewVisibleContext, SidebarFocusContext))))
-    },
-    order: 2
-}));
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    group: '4_save',
-    command: {
-        id: SAVE_ALL_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miSaveAll', comment: ['&& denotes a mnemonic'] }, "Save A&&ll"),
-        precondition: DirtyWorkingCopiesContext
-    },
-    order: 3
-}));
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    group: '5_autosave',
-    command: {
-        id: ToggleAutoSaveAction.ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miAutoSave', comment: ['&& denotes a mnemonic'] }, "A&&uto Save"),
-        toggled: ( ContextKeyExpr.notEquals('config.files.autoSave', 'off'))
-    },
-    order: 1
-}));
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    group: '6_close',
-    command: {
-        id: REVERT_FILE_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miRevert', comment: ['&& denotes a mnemonic'] }, "Re&&vert File"),
-        precondition: ( ContextKeyExpr.or((
-        ContextKeyExpr.and(ActiveEditorCanRevertContext)), (
-        ContextKeyExpr.and(( ResourceContextKey.Scheme.notEqualsTo(Schemas.untitled)), FoldersViewVisibleContext, SidebarFocusContext)))),
-    },
-    order: 1
-}));
-( MenuRegistry.appendMenuItem(MenuId.MenubarFileMenu, {
-    group: '6_close',
-    command: {
-        id: CLOSE_EDITOR_COMMAND_ID,
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miCloseEditor', comment: ['&& denotes a mnemonic'] }, "&&Close Editor"),
-        precondition: ( ContextKeyExpr.or(ActiveEditorContext, ( ContextKeyExpr.and(FoldersViewVisibleContext, SidebarFocusContext))))
-    },
-    order: 2
-}));
 MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
     group: '3_global_nav',
     command: {
         id: 'workbench.action.quickOpen',
-        title: nls.localizeWithPath('vs/workbench/contrib/files/browser/fileActions.contribution', { key: 'miGotoFile', comment: ['&& denotes a mnemonic'] }, "Go to &&File...")
+        title: ( nls.localizeWithPath(
+            'vs/workbench/contrib/files/browser/fileActions.contribution',
+            { key: 'miGotoFile', comment: ['&& denotes a mnemonic'] },
+            "Go to &&File..."
+        ))
     },
     order: 1
 });