@codingame/monaco-vscode-api 2.2.2 → 3.1.0

package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js

@@ -15,16 +15,18 @@ import { EditorStatusContribution, ChangeLanguageAction, ChangeEOLAction, Change
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { ShowEditorsInActiveGroupByMostRecentlyUsedAction, ShowAllEditorsByAppearanceAction, ShowAllEditorsByMostRecentlyUsedAction, ReopenClosedEditorAction, ClearRecentFilesAction, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoByTwoGridAction, EditorLayoutTwoRowsRightAction, EditorLayoutTwoColumnsBottomAction, NavigateForwardAction, NavigateBackwardsAction, OpenNextEditor, OpenPreviousEditor, OpenNextEditorInGroup, OpenPreviousEditorInGroup, OpenFirstEditorInGroup, OpenLastEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, CloseAllEditorsAction, CloseAllEditorGroupsAction, CloseLeftEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseEditorInAllGroupsAction, RevertAndCloseEditorAction, SplitEditorAction, SplitEditorOrthogonalAction, SplitEditorLeftAction, SplitEditorRightAction, SplitEditorUpAction, SplitEditorDownAction, JoinTwoGroupsAction, JoinAllGroupsAction, NavigateBetweenGroupsAction, ResetGroupSizesAction, ToggleGroupSizesAction, MaximizeGroupHideSidebarAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsAction, MinimizeOtherGroupsHideSidebarAction, MoveEditorLeftInGroupAction, MoveEditorRightInGroupAction, MoveGroupLeftAction, MoveGroupRightAction, MoveGroupUpAction, MoveGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, DuplicateGroupDownAction, MoveEditorToPreviousGroupAction, MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorToLastGroupAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToNextGroupAction, SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToRightGroupAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusLastGroupAction, FocusPreviousGroup, FocusNextGroup, FocusLeftGroup, FocusRightGroup, FocusAboveGroup, FocusBelowGroup, NewEditorGroupLeftAction, NewEditorGroupRightAction, NewEditorGroupAboveAction, NewEditorGroupBelowAction, NavigatePreviousAction, NavigateForwardInEditsAction, NavigateBackwardsInEditsAction, NavigatePreviousInEditsAction, NavigateToLastEditLocationAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigateToLastNavigationLocationAction, ClearEditorHistoryAction, ToggleEditorTypeAction, ReOpenInTextEditorAction, QuickAccessPreviousRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, MoveEditorGroupToNewWindowAction, CopyEditorGroupToNewWindowAction, RestoreEditorsToMainWindowAction, NewEmptyEditorWindowAction } from './editorActions.js';
+import { ShowEditorsInActiveGroupByMostRecentlyUsedAction, ShowAllEditorsByAppearanceAction, ShowAllEditorsByMostRecentlyUsedAction, NavigateBackwardsAction, NavigateForwardAction, ReopenClosedEditorAction, ClearRecentFilesAction, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoByTwoGridAction, EditorLayoutTwoRowsRightAction, EditorLayoutTwoColumnsBottomAction, OpenNextEditor, OpenPreviousEditor, OpenNextEditorInGroup, OpenPreviousEditorInGroup, OpenFirstEditorInGroup, OpenLastEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, CloseAllEditorsAction, CloseAllEditorGroupsAction, CloseLeftEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseEditorInAllGroupsAction, RevertAndCloseEditorAction, SplitEditorAction, SplitEditorOrthogonalAction, SplitEditorLeftAction, SplitEditorRightAction, SplitEditorUpAction, SplitEditorDownAction, JoinTwoGroupsAction, JoinAllGroupsAction, NavigateBetweenGroupsAction, ResetGroupSizesAction, ToggleGroupSizesAction, MaximizeGroupHideSidebarAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsAction, MinimizeOtherGroupsHideSidebarAction, MoveEditorLeftInGroupAction, MoveEditorRightInGroupAction, MoveGroupLeftAction, MoveGroupRightAction, MoveGroupUpAction, MoveGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, DuplicateGroupDownAction, MoveEditorToPreviousGroupAction, MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorToLastGroupAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToNextGroupAction, SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToRightGroupAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusLastGroupAction, FocusPreviousGroup, FocusNextGroup, FocusLeftGroup, FocusRightGroup, FocusAboveGroup, FocusBelowGroup, NewEditorGroupLeftAction, NewEditorGroupRightAction, NewEditorGroupAboveAction, NewEditorGroupBelowAction, NavigatePreviousAction, NavigateForwardInEditsAction, NavigateBackwardsInEditsAction, NavigatePreviousInEditsAction, NavigateToLastEditLocationAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigateToLastNavigationLocationAction, ClearEditorHistoryAction, ToggleEditorTypeAction, ReOpenInTextEditorAction, QuickAccessPreviousRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, MoveEditorGroupToNewWindowAction, CopyEditorGroupToNewWindowAction, RestoreEditorsToMainWindowAction, NewEmptyEditorWindowAction } from './editorActions.js';
 import { setup, LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, TOGGLE_DIFF_SIDE_BY_SIDE, SHOW_EDITORS_IN_GROUP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, SPLIT_EDITOR, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE, DIFF_SWAP_SIDES, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT } from './editorCommands.js';
 import { getQuickNavigateHandler, inQuickPickContext } from '../../quickaccess.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { isMacintosh } from '../../../../base/common/platform.js';
 import { registerEditorContribution } from '../../../../editor/browser/editorExtensions.js';
 import { FloatingEditorClickMenu } from '../../codeeditor.js';
-import { Extensions } from '../../../common/contributions.js';
-import { Extensions as Extensions$1 } from '../../../../platform/quickinput/common/quickAccess.js';
+import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
+import { Extensions } from '../../../../platform/quickinput/common/quickAccess.js';
 import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess, AllEditorsByAppearanceQuickAccess, AllEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
+import { FileAccess } from '../../../../base/common/network.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorHandler } from '../../../services/untitled/common/untitledTextEditorHandler.js';
@@ -64,11 +66,11 @@ import './editor.autosave.contribution.js';
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(UntitledTextEditorInput.ID, UntitledTextEditorInputSerializer);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(SideBySideEditorInput.ID, SideBySideEditorInputSerializer);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(DiffEditorInput.ID, DiffEditorInputSerializer);
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(EditorStatusContribution, 2 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(UntitledTextEditorWorkingCopyEditorHandler, 2 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(DynamicEditorConfigurations, 2 );
+registerWorkbenchContribution2(EditorStatusContribution.ID, EditorStatusContribution, 2 );
+registerWorkbenchContribution2(UntitledTextEditorWorkingCopyEditorHandler.ID, UntitledTextEditorWorkingCopyEditorHandler, 2 );
+registerWorkbenchContribution2(DynamicEditorConfigurations.ID, DynamicEditorConfigurations, 2 );
 registerEditorContribution(FloatingEditorClickMenu.ID, FloatingEditorClickMenu, 1 );
-const quickAccessRegistry = ( Registry.as(Extensions$1.Quickaccess));
+const quickAccessRegistry = ( Registry.as(Extensions.Quickaccess));
 const editorPickerContextKey = 'inEditorsPicker';
 const editorPickerContext = ( ContextKeyExpr.and(inQuickPickContext, ( ContextKeyExpr.has(editorPickerContextKey))));
 quickAccessRegistry.registerQuickAccessProvider({
@@ -246,6 +248,18 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     mac: { primary: 256  | 1024  | 2  }
 });
 setup();
+if (isMacintosh) {
+    MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
+        command: { id: NavigateBackwardsAction.ID, title: NavigateBackwardsAction.LABEL, icon: { dark: ( FileAccess.asFileUri('vs/workbench/browser/parts/editor/media/back-tb.png')) } },
+        group: 'navigation',
+        order: 0
+    });
+    MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
+        command: { id: NavigateForwardAction.ID, title: NavigateForwardAction.LABEL, icon: { dark: ( FileAccess.asFileUri('vs/workbench/browser/parts/editor/media/forward-tb.png')) } },
+        group: 'navigation',
+        order: 1
+    });
+}
 MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: LOCK_GROUP_COMMAND_ID, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'lockGroupAction',
@@ -791,8 +805,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_UP,
         title: {
-            original: 'Split Up',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorUpWithoutMnemonic',
                 "Split Up"
@@ -811,8 +824,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_DOWN,
         title: {
-            original: 'Split Down',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorDownWithoutMnemonic',
                 "Split Down"
@@ -821,7 +833,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] },
                 "Split &&Down"
-            ))
+            )),
         }
     },
     order: 2
@@ -831,8 +843,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_LEFT,
         title: {
-            original: 'Split Left',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorLeftWithoutMnemonic',
                 "Split Left"
@@ -841,7 +852,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] },
                 "Split &&Left"
-            ))
+            )),
         }
     },
     order: 3
@@ -851,8 +862,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_RIGHT,
         title: {
-            original: 'Split Right',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorRightWithoutMnemonic',
                 "Split Right"
@@ -861,7 +871,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] },
                 "Split &&Right"
-            ))
+            )),
         }
     },
     order: 4
@@ -871,8 +881,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: SPLIT_EDITOR_IN_GROUP,
         title: {
-            original: 'Split in Group',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSplitEditorInGroupWithoutMnemonic',
                 "Split in Group"
@@ -881,7 +890,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSplitEditorInGroup', comment: ['&& denotes a mnemonic'] },
                 "Split in &&Group"
-            ))
+            )),
         }
     },
     when: ActiveEditorCanSplitInGroupContext,
@@ -892,8 +901,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: JOIN_EDITOR_IN_GROUP,
         title: {
-            original: 'Join in Group',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miJoinEditorInGroupWithoutMnemonic',
                 "Join in Group"
@@ -902,7 +910,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miJoinEditorInGroup', comment: ['&& denotes a mnemonic'] },
                 "Join in &&Group"
-            ))
+            )),
         }
     },
     when: SideBySideEditorActiveContext,
@@ -913,8 +921,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID,
         title: {
-            original: 'Move Editor into New Window',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'moveEditorToNewWindow',
                 "Move Editor into New Window"
@@ -923,7 +930,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miMoveEditorToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Move Editor into New Window"
-            ))
+            )),
         }
     },
     order: 1
@@ -933,8 +940,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID,
         title: {
-            original: 'Copy Editor into New Window',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'copyEditorToNewWindow',
                 "Copy Editor into New Window"
@@ -943,7 +949,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miCopyEditorToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Copy Editor into New Window"
-            ))
+            )),
         }
     },
     order: 2
@@ -953,8 +959,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutSingleAction.ID,
         title: {
-            original: 'Single',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miSingleColumnEditorLayoutWithoutMnemonic',
                 "Single"
@@ -963,7 +968,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "&&Single"
-            ))
+            )),
         }
     },
     order: 1
@@ -973,8 +978,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoColumnsAction.ID,
         title: {
-            original: 'Two Columns',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoColumnsEditorLayoutWithoutMnemonic',
                 "Two Columns"
@@ -983,7 +987,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoColumnsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "&&Two Columns"
-            ))
+            )),
         }
     },
     order: 3
@@ -993,8 +997,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutThreeColumnsAction.ID,
         title: {
-            original: 'Three Columns',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miThreeColumnsEditorLayoutWithoutMnemonic',
                 "Three Columns"
@@ -1003,7 +1006,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miThreeColumnsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "T&&hree Columns"
-            ))
+            )),
         }
     },
     order: 4
@@ -1013,8 +1016,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoRowsAction.ID,
         title: {
-            original: 'Two Rows',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoRowsEditorLayoutWithoutMnemonic',
                 "Two Rows"
@@ -1023,7 +1025,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoRowsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "T&&wo Rows"
-            ))
+            )),
         }
     },
     order: 5
@@ -1033,8 +1035,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutThreeRowsAction.ID,
         title: {
-            original: 'Three Rows',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miThreeRowsEditorLayoutWithoutMnemonic',
                 "Three Rows"
@@ -1043,7 +1044,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miThreeRowsEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "Three &&Rows"
-            ))
+            )),
         }
     },
     order: 6
@@ -1053,8 +1054,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoByTwoGridAction.ID,
         title: {
-            original: 'Grid (2x2)',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoByTwoGridEditorLayoutWithoutMnemonic',
                 "Grid (2x2)"
@@ -1063,7 +1063,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoByTwoGridEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "&&Grid (2x2)"
-            ))
+            )),
         }
     },
     order: 7
@@ -1073,8 +1073,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoRowsRightAction.ID,
         title: {
-            original: 'Two Rows Right',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoRowsRightEditorLayoutWithoutMnemonic',
                 "Two Rows Right"
@@ -1083,7 +1082,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoRowsRightEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "Two R&&ows Right"
-            ))
+            )),
         }
     },
     order: 8
@@ -1093,8 +1092,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
     command: {
         id: EditorLayoutTwoColumnsBottomAction.ID,
         title: {
-            original: 'Two Columns Bottom',
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 'miTwoColumnsBottomEditorLayoutWithoutMnemonic',
                 "Two Columns Bottom"
@@ -1103,7 +1101,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarLayoutMenu, {
                 'vs/workbench/browser/parts/editor/editor.contribution',
                 { key: 'miTwoColumnsBottomEditorLayout', comment: ['&& denotes a mnemonic'] },
                 "Two &&Columns Bottom"
-            ))
+            )),
         }
     },
     order: 9

package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js

@@ -1299,15 +1299,18 @@ class NavigateForwardAction extends Action2 {
     constructor() {
         super({
             id: NavigateForwardAction.ID,
-            title: { value: ( localizeWithPath(
-                'vs/workbench/browser/parts/editor/editorActions',
-                'navigateForward',
-                "Go Forward"
-            )), original: 'Go Forward', mnemonicTitle: ( localizeWithPath(
-                'vs/workbench/browser/parts/editor/editorActions',
-                { key: 'miForward', comment: ['&& denotes a mnemonic'] },
-                "&&Forward"
-            )) },
+            title: {
+                ...( localize2WithPath(
+                    'vs/workbench/browser/parts/editor/editorActions',
+                    'navigateForward',
+                    "Go Forward"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/parts/editor/editorActions',
+                    { key: 'miForward', comment: ['&& denotes a mnemonic'] },
+                    "&&Forward"
+                ))
+            },
             f1: true,
             icon: Codicon.arrowRight,
             precondition: ( ContextKeyExpr.has('canNavigateForward')),
@@ -1338,15 +1341,18 @@ class NavigateBackwardsAction extends Action2 {
     constructor() {
         super({
             id: NavigateBackwardsAction.ID,
-            title: { value: ( localizeWithPath(
-                'vs/workbench/browser/parts/editor/editorActions',
-                'navigateBack',
-                "Go Back"
-            )), original: 'Go Back', mnemonicTitle: ( localizeWithPath(
-                'vs/workbench/browser/parts/editor/editorActions',
-                { key: 'miBack', comment: ['&& denotes a mnemonic'] },
-                "&&Back"
-            )) },
+            title: {
+                ...( localize2WithPath(
+                    'vs/workbench/browser/parts/editor/editorActions',
+                    'navigateBack',
+                    "Go Back"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/parts/editor/editorActions',
+                    { key: 'miBack', comment: ['&& denotes a mnemonic'] },
+                    "&&Back"
+                ))
+            },
             f1: true,
             precondition: ( ContextKeyExpr.has('canNavigateBack')),
             icon: Codicon.arrowLeft,
@@ -2482,7 +2488,7 @@ class BaseMoveCopyEditorToNewWindowAction extends Action2 {
 class MoveEditorToNewWindowAction extends BaseMoveCopyEditorToNewWindowAction {
     constructor() {
         super(MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, {
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editorActions',
                 'moveEditorToNewWindow',
                 "Move Editor into New Window"
@@ -2492,14 +2498,13 @@ class MoveEditorToNewWindowAction extends BaseMoveCopyEditorToNewWindowAction {
                 { key: 'miMoveEditorToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Move Editor into New Window"
             )),
-            original: 'Move Editor into New Window'
         }, undefined, true);
     }
 }
 class CopyEditorToNewindowAction extends BaseMoveCopyEditorToNewWindowAction {
     constructor() {
         super(COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, {
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editorActions',
                 'copyEditorToNewWindow',
                 "Copy Editor into New Window"
@@ -2509,7 +2514,6 @@ class CopyEditorToNewindowAction extends BaseMoveCopyEditorToNewWindowAction {
                 { key: 'miCopyEditorToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Copy Editor into New Window"
             )),
-            original: 'Copy Editor into New Window'
         }, { primary: KeyChord(2048  | 41 , 45 ), weight: 200  }, false);
     }
 }
@@ -2536,7 +2540,7 @@ class BaseMoveCopyEditorGroupToNewWindowAction extends Action2 {
 class MoveEditorGroupToNewWindowAction extends BaseMoveCopyEditorGroupToNewWindowAction {
     constructor() {
         super(MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, {
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editorActions',
                 'moveEditorGroupToNewWindow',
                 "Move Editor Group into New Window"
@@ -2546,14 +2550,13 @@ class MoveEditorGroupToNewWindowAction extends BaseMoveCopyEditorGroupToNewWindo
                 { key: 'miMoveEditorGroupToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Move Editor Group into New Window"
             )),
-            original: 'Move Editor Group into New Window'
         }, true);
     }
 }
 class CopyEditorGroupToNewWindowAction extends BaseMoveCopyEditorGroupToNewWindowAction {
     constructor() {
         super(COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, {
-            value: ( localizeWithPath(
+            ...( localize2WithPath(
                 'vs/workbench/browser/parts/editor/editorActions',
                 'copyEditorGroupToNewWindow',
                 "Copy Editor Group into New Window"
@@ -2563,7 +2566,6 @@ class CopyEditorGroupToNewWindowAction extends BaseMoveCopyEditorGroupToNewWindo
                 { key: 'miCopyEditorGroupToNewWindow', comment: ['&& denotes a mnemonic'] },
                 "&&Copy Editor Group into New Window"
             )),
-            original: 'Copy Editor Group into New Window'
         }, false);
     }
 }
@@ -2572,7 +2574,7 @@ class RestoreEditorsToMainWindowAction extends Action2 {
         super({
             id: 'workbench.action.restoreEditorsToMainWindow',
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorActions',
                     'restoreEditorsToMainWindow',
                     "Restore Editors into Main Window"
@@ -2582,7 +2584,6 @@ class RestoreEditorsToMainWindowAction extends Action2 {
                     { key: 'miRestoreEditorsToMainWindow', comment: ['&& denotes a mnemonic'] },
                     "&&Restore Editors into Main Window"
                 )),
-                original: 'Restore Editors into Main Window'
             },
             f1: true,
             precondition: IsAuxiliaryWindowFocusedContext,
@@ -2599,7 +2600,7 @@ class NewEmptyEditorWindowAction extends Action2 {
         super({
             id: NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID,
             title: {
-                value: ( localizeWithPath(
+                ...( localize2WithPath(
                     'vs/workbench/browser/parts/editor/editorActions',
                     'newEmptyEditorWindow',
                     "New Empty Editor Window"
@@ -2609,7 +2610,6 @@ class NewEmptyEditorWindowAction extends Action2 {
                     { key: 'miNewEmptyEditorWindow', comment: ['&& denotes a mnemonic'] },
                     "&&New Empty Editor Window"
                 )),
-                original: 'New Empty Editor Window'
             },
             f1: true,
             category: Categories.View

package/vscode/src/vs/workbench/browser/parts/editor/editorAutoSave.js

@@ -10,6 +10,7 @@ import { IMarkerService } from '../../../../platform/markers/common/markers.js';
 import { ResourceMap } from '../../../../base/common/map.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 let EditorAutoSave = class EditorAutoSave extends Disposable {
+    static { this.ID = 'workbench.contrib.editorAutoSave'; }
     constructor(filesConfigurationService, hostService, editorService, editorGroupService, workingCopyService, logService, markerService, uriIdentityService) {
         super();
         this.filesConfigurationService = filesConfigurationService;

package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js

@@ -438,11 +438,11 @@ function registerDiffEditorCommands() {
         if (!diffEditor || typeof activeGroup === 'undefined' || !(diffInput instanceof DiffEditorInput) || !diffInput.modified.resource) {
             return;
         }
-        const untypedDiffInput = diffInput.toUntyped({ preserveViewState: activeGroup.id });
+        const untypedDiffInput = diffInput.toUntyped({ preserveViewState: activeGroup.id, preserveResource: true });
         if (!untypedDiffInput) {
             return;
         }
-        if (diffInput.modified.isModified() && !editorService.isOpened({ resource: diffInput.modified.resource, typeId: diffInput.modified.typeId, editorId: diffInput.modified.editorId })) {
+        if (diffInput.modified.isModified() && editorService.findEditors({ resource: diffInput.modified.resource, typeId: diffInput.modified.typeId, editorId: diffInput.modified.editorId }).length === 0) {
             await editorService.openEditor({
                 ...untypedDiffInput.modified,
                 options: {
@@ -512,14 +512,11 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: TOGGLE_DIFF_SIDE_BY_SIDE,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/editor/editorCommands',
-                    'toggleInlineView',
-                    "Toggle Inline View"
-                )),
-                original: 'Compare: Toggle Inline View'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/editorCommands',
+                'toggleInlineView',
+                "Toggle Inline View"
+            )),
             category: ( localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare', "Compare"))
         },
         when: TextCompareEditorActiveContext
@@ -527,14 +524,11 @@ function registerDiffEditorCommands() {
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
             id: DIFF_SWAP_SIDES,
-            title: {
-                value: ( localizeWithPath(
-                    'vs/workbench/browser/parts/editor/editorCommands',
-                    'swapDiffSides',
-                    "Swap Left and Right Editor Side"
-                )),
-                original: 'Compare: Swap Left and Right Editor Side'
-            },
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/editorCommands',
+                'swapDiffSides',
+                "Swap Left and Right Editor Side"
+            )),
             category: ( localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare', "Compare"))
         },
         when: TextCompareEditorActiveContext

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js

@@ -13,6 +13,7 @@ import { getLargeFileConfirmationLimit, ByteSize } from '../../../../platform/fi
 var DynamicEditorConfigurations_1;
 let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disposable {
     static { DynamicEditorConfigurations_1 = this; }
+    static { this.ID = 'workbench.contrib.dynamicEditorConfigurations'; }
     static { this.AUTO_LOCK_DEFAULT_ENABLED = ( new Set([
         'terminalEditor',
         'mainThreadWebview-simpleBrowser.view',

package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js

@@ -165,7 +165,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             activeEditorListener.clear();
             this.scopedContextKeyService.bufferChangeEvents(() => {
                 const activeEditor = this.activeEditor;
-                this.resourceContext.set(EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY } ?? null));
+                this.resourceContext.set(EditorResourceAccessor.getOriginalUri(activeEditor, { supportSideBySide: SideBySideEditor.PRIMARY }));
                 applyAvailableEditorIds(groupActiveEditorAvailableEditorIds, activeEditor, this.editorResolverService);
                 groupActiveEditorCanSplitInGroupContext.set(activeEditor ? activeEditor.hasCapability(32 ) : false);
                 sideBySideEditorContext.set(activeEditor?.typeId === SideBySideEditorInput.ID);

package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js

@@ -70,12 +70,12 @@ const toggleFullscreen = { text: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editorGroupWatermark',
     { key: 'watermark.toggleFullscreen', comment: ['toggle is a verb here'] },
     "Toggle Full Screen"
-)), id: 'workbench.action.toggleFullScreen', when: ( ( ContextKeyExpr.equals('terminalProcessSupported', true)).negate()) };
+)), id: 'workbench.action.toggleFullScreen' };
 const showSettings = { text: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editorGroupWatermark',
     'watermark.showSettings',
     "Show Settings"
-)), id: 'workbench.action.openSettings', when: ( ( ContextKeyExpr.equals('terminalProcessSupported', true)).negate()) };
+)), id: 'workbench.action.openSettings' };
 const noFolderEntries = [
     showCommands,
     openFileNonMacOnly,
@@ -149,13 +149,14 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
         const selected = (folder ? folderEntries : noFolderEntries)
             .filter(entry => !('when' in entry) || this.contextKeyService.contextMatchesRules(entry.when))
             .filter(entry => !('mac' in entry) || entry.mac === (isMacintosh && !isWeb))
-            .filter(entry => !!CommandsRegistry.getCommand(entry.id));
+            .filter(entry => !!CommandsRegistry.getCommand(entry.id))
+            .filter(entry => !!this.keybindingService.lookupKeybinding(entry.id));
         const update = () => {
             clearNode(box);
-            selected.forEach(entry => {
+            for (const entry of selected) {
                 const keys = this.keybindingService.lookupKeybinding(entry.id);
                 if (!keys) {
-                    return;
+                    continue;
                 }
                 const dl = append(box, $('dl'));
                 const dt = append(dl, $('dt'));
@@ -167,7 +168,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
                     { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles }
                 ));
                 keybinding.set(keys);
-            });
+            }
         };
         update();
         this.transientDisposables.add(this.keybindingService.onDidUpdateKeybindings(update));