@codingame/monaco-vscode-view-common-service-override 4.5.1 → 4.5.2

package/vscode/src/vs/workbench/browser/actions/listCommands.js

@@ -16,6 +16,7 @@ import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/comm
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 
+const _moduleId = "vs/workbench/browser/actions/listCommands";
 function ensureDOMFocus(widget) {
     const element = widget?.getHTMLElement();
     if (element && !isActiveElement(element)) {
@@ -33,7 +34,7 @@ async function updateFocus(widget, updateFocusFn) {
     if (selection.length > 1 || !equals(focus, selection) || equals(focus, newFocus)) {
         return;
     }
-    const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+    const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
     widget.setSelection(newFocus, fakeKeyboardEvent);
 }
 async function navigate(widget, updateFocusFn) {
@@ -59,7 +60,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     },
     handler: (accessor, arg2) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             await widget.focusNext(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
         });
     }
@@ -75,7 +76,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     },
     handler: (accessor, arg2) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             await widget.focusPrevious(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
         });
     }
@@ -91,7 +92,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     },
     handler: (accessor, arg2) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown', { altKey: true })));
             await widget.focusNext(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
         });
     }
@@ -107,7 +108,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     },
     handler: (accessor, arg2) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown', { altKey: true })));
             await widget.focusPrevious(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
         });
     }
@@ -119,7 +120,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: 12 ,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             await widget.focusNextPage(fakeKeyboardEvent);
         });
     }
@@ -131,7 +132,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: 11 ,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             await widget.focusPreviousPage(fakeKeyboardEvent);
         });
     }
@@ -143,7 +144,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: 14 ,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             await widget.focusFirst(fakeKeyboardEvent);
         });
     }
@@ -155,7 +156,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: 13 ,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             await widget.focusLast(fakeKeyboardEvent);
         });
     }
@@ -167,7 +168,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: 512  | 14 ,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown', { altKey: true })));
             await widget.focusFirst(fakeKeyboardEvent);
         });
     }
@@ -179,7 +180,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: 512  | 13 ,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown', { altKey: true })));
             await widget.focusLast(fakeKeyboardEvent);
         });
     }
@@ -205,7 +206,7 @@ function expandMultiSelection(focused, previousFocus) {
             return;
         }
         const selection = list.getSelection();
-        const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { shiftKey: true }));
+        const fakeKeyboardEvent = ( (new KeyboardEvent('keydown', { shiftKey: true })));
         if (selection && selection.indexOf(focus) >= 0) {
             list.setSelection(selection.filter(s => s !== previousFocus), fakeKeyboardEvent);
         }
@@ -217,10 +218,10 @@ function expandMultiSelection(focused, previousFocus) {
 function revealFocusedStickyScroll(tree, postRevealAction) {
     const focus = tree.getStickyScrollFocus();
     if (focus.length === 0) {
-        throw new Error(`StickyScroll has no focus`);
+        throw ( (new Error(`StickyScroll has no focus`)));
     }
     if (focus.length > 1) {
-        throw new Error(`StickyScroll can only have a single focused item`);
+        throw ( (new Error(`StickyScroll can only have a single focused item`)));
     }
     tree.reveal(focus[0]);
     tree.getHTMLElement().focus();
@@ -230,7 +231,7 @@ function revealFocusedStickyScroll(tree, postRevealAction) {
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expandSelectionDown',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey)),
+    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
     primary: 1024  | 18 ,
     handler: (accessor, arg2) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -238,7 +239,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             return;
         }
         const previousFocus = widget.getFocus() ? widget.getFocus()[0] : undefined;
-        const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+        const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
         widget.focusNext(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
         expandMultiSelection(widget, previousFocus);
         const focus = widget.getFocus();
@@ -251,7 +252,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expandSelectionUp',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey)),
+    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
     primary: 1024  | 16 ,
     handler: (accessor, arg2) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -259,7 +260,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             return;
         }
         const previousFocus = widget.getFocus() ? widget.getFocus()[0] : undefined;
-        const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+        const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
         widget.focusPrevious(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
         expandMultiSelection(widget, previousFocus);
         const focus = widget.getFocus();
@@ -272,7 +273,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.collapse',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, ( ContextKeyExpr.or(WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent)))),
+    when: ( (ContextKeyExpr.and(
+        WorkbenchListFocusContextKey,
+         (ContextKeyExpr.or(WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent))
+    ))),
     primary: 15 ,
     mac: {
         primary: 15 ,
@@ -293,7 +297,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             const parent = tree.getParentElement(focus);
             if (parent) {
                 navigate(widget, widget => {
-                    const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+                    const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
                     widget.setFocus([parent], fakeKeyboardEvent);
                 });
             }
@@ -369,7 +373,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         const parent = tree.getParentElement(focus);
         if (parent) {
             navigate(widget, widget => {
-                const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+                const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
                 widget.setFocus([parent], fakeKeyboardEvent);
             });
         }
@@ -378,7 +382,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expand',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, ( ContextKeyExpr.or(WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild)))),
+    when: ( (ContextKeyExpr.and(
+        WorkbenchListFocusContextKey,
+         (ContextKeyExpr.or(WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild))
+    ))),
     primary: 17 ,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -397,7 +404,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
                     const node = widget.getNode(child);
                     if (node.visible) {
                         navigate(widget, widget => {
-                            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+                            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
                             widget.setFocus([child], fakeKeyboardEvent);
                         });
                     }
@@ -417,7 +424,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
                         const node = widget.getNode(child);
                         if (node.visible) {
                             navigate(widget, widget => {
-                                const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+                                const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
                                 widget.setFocus([child], fakeKeyboardEvent);
                             });
                         }
@@ -495,13 +502,13 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.selectAll',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey)),
+    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
     primary: 2048  | 31 ,
     handler: (accessor) => {
         const focused = accessor.get(IListService).lastFocusedList;
         if (focused instanceof List || focused instanceof PagedList || focused instanceof Table) {
             const list = focused;
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             list.setSelection(range(list.length), fakeKeyboardEvent);
         }
         else if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
@@ -537,7 +544,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             if (scope && selection.length === newSelection.length) {
                 newSelection.unshift(scope);
             }
-            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
             tree.setSelection(newSelection, fakeKeyboardEvent);
         }
     }
@@ -600,7 +607,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.clear',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListHasSelectionOrFocus)),
+    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListHasSelectionOrFocus))),
     primary: 9 ,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -608,7 +615,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             return;
         }
         const selection = widget.getSelection();
-        const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
+        const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
         if (selection.length > 1) {
             const useSelectionNavigation = WorkbenchListSelectionNavigation.getValue(widget.contextKeyService);
             if (useSelectionNavigation) {
@@ -658,7 +665,7 @@ CommandsRegistry.registerCommandAlias('list.toggleFilterOnType', 'list.toggleFin
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.find',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind)),
+    when: ( (ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind))),
     primary: 2048  | 36 ,
     secondary: [61 ],
     handler: (accessor) => {
@@ -673,7 +680,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.closeFind',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen)),
+    when: ( (ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen))),
     primary: 9 ,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -686,7 +693,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollUp',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListScrollAtTopContextKey?.negate())),
+    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListScrollAtTopContextKey?.negate()))),
     primary: 2048  | 16 ,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -699,10 +706,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollDown',
     weight: 200 ,
-    when: ( ContextKeyExpr.and(
+    when: ( (ContextKeyExpr.and(
         WorkbenchListFocusContextKey,
         WorkbenchListScrollAtBottomContextKey?.negate()
-    )),
+    ))),
     primary: 2048  | 18 ,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -741,16 +748,8 @@ registerAction2(class ToggleStickyScroll extends Action2 {
         super({
             id: 'tree.toggleStickyScroll',
             title: {
-                ...( localize2WithPath(
-                    'vs/workbench/browser/actions/listCommands',
-                    'toggleTreeStickyScroll',
-                    "Toggle Tree Sticky Scroll"
-                )),
-                mnemonicTitle: ( localizeWithPath(
-                    'vs/workbench/browser/actions/listCommands',
-                    { key: 'mitoggleTreeStickyScroll', comment: ['&& denotes a mnemonic'] },
-                    "&&Toggle Tree Sticky Scroll"
-                )),
+                ...( localize2WithPath(_moduleId, 0, "Toggle Tree Sticky Scroll")),
+                mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Toggle Tree Sticky Scroll")),
             },
             category: 'View',
             f1: true

package/vscode/src/vs/workbench/browser/actions/navigationActions.js

@@ -8,6 +8,7 @@ import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/p
 import { getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { isAuxiliaryWindow } from 'vscode/vscode/vs/base/browser/window';
 
+const _moduleId = "vs/workbench/browser/actions/navigationActions";
 class BaseNavigationAction extends Action2 {
     constructor(options, direction) {
         super(options);
@@ -142,11 +143,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateLeft',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/actions/navigationActions',
-                'navigateLeft',
-                'Navigate to the View on the Left'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'Navigate to the View on the Left')),
             category: Categories.View,
             f1: true
         }, 2 );
@@ -156,11 +153,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateRight',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/actions/navigationActions',
-                'navigateRight',
-                'Navigate to the View on the Right'
-            )),
+            title: ( localize2WithPath(_moduleId, 1, 'Navigate to the View on the Right')),
             category: Categories.View,
             f1: true
         }, 3 );
@@ -170,11 +163,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateUp',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/actions/navigationActions',
-                'navigateUp',
-                'Navigate to the View Above'
-            )),
+            title: ( localize2WithPath(_moduleId, 2, 'Navigate to the View Above')),
             category: Categories.View,
             f1: true
         }, 0 );
@@ -184,11 +173,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateDown',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/actions/navigationActions',
-                'navigateDown',
-                'Navigate to the View Below'
-            )),
+            title: ( localize2WithPath(_moduleId, 3, 'Navigate to the View Below')),
             category: Categories.View,
             f1: true
         }, 1 );
@@ -267,11 +252,7 @@ registerAction2(class extends BaseFocusAction {
     constructor() {
         super({
             id: 'workbench.action.focusNextPart',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/actions/navigationActions',
-                'focusNextPart',
-                'Focus Next Part'
-            )),
+            title: ( localize2WithPath(_moduleId, 4, 'Focus Next Part')),
             category: Categories.View,
             f1: true,
             keybinding: {
@@ -285,11 +266,7 @@ registerAction2(class extends BaseFocusAction {
     constructor() {
         super({
             id: 'workbench.action.focusPreviousPart',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/actions/navigationActions',
-                'focusPreviousPart',
-                'Focus Previous Part'
-            )),
+            title: ( localize2WithPath(_moduleId, 5, 'Focus Previous Part')),
             category: Categories.View,
             f1: true,
             keybinding: {