@codingame/monaco-vscode-view-common-service-override 11.1.2 → 12.0.0

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

@@ -1,5 +1,6 @@
-import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
-import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+
+import { KeyCode, KeyMod, KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
+import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { List } from 'vscode/vscode/vs/base/browser/ui/list/listWidget';
 import { WorkbenchListSelectionNavigation, WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent, WorkbenchTreeStickyScrollFocused, getSelectionKeyboardEvent, WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild, WorkbenchListHasSelectionOrFocus, RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind, WorkbenchTreeFindOpen, WorkbenchListScrollAtTopContextKey, WorkbenchListScrollAtBottomContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { IListService } from 'vscode/vscode/vs/platform/list/browser/listService.service';
@@ -35,7 +36,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) {
@@ -52,136 +53,136 @@ async function navigate(widget, updateFocusFn) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusDown',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 18 ,
+    primary: KeyCode.DownArrow,
     mac: {
-        primary: 18 ,
-        secondary: [256  | 44 ]
+        primary: KeyCode.DownArrow,
+        secondary: [KeyMod.WinCtrl | KeyCode.KeyN]
     },
     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);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 16 ,
+    primary: KeyCode.UpArrow,
     mac: {
-        primary: 16 ,
-        secondary: [256  | 46 ]
+        primary: KeyCode.UpArrow,
+        secondary: [KeyMod.WinCtrl | KeyCode.KeyP]
     },
     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);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusAnyDown',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 512  | 18 ,
+    primary: KeyMod.Alt | KeyCode.DownArrow,
     mac: {
-        primary: 512  | 18 ,
-        secondary: [256  | 512  | 44 ]
+        primary: KeyMod.Alt | KeyCode.DownArrow,
+        secondary: [KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyN]
     },
     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);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusAnyUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 512  | 16 ,
+    primary: KeyMod.Alt | KeyCode.UpArrow,
     mac: {
-        primary: 512  | 16 ,
-        secondary: [256  | 512  | 46 ]
+        primary: KeyMod.Alt | KeyCode.UpArrow,
+        secondary: [KeyMod.WinCtrl | KeyMod.Alt | KeyCode.KeyP]
     },
     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);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusPageDown',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 12 ,
+    primary: KeyCode.PageDown,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
             await widget.focusNextPage(fakeKeyboardEvent);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusPageUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 11 ,
+    primary: KeyCode.PageUp,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
             await widget.focusPreviousPage(fakeKeyboardEvent);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusFirst',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 14 ,
+    primary: KeyCode.Home,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
             await widget.focusFirst(fakeKeyboardEvent);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusLast',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 13 ,
+    primary: KeyCode.End,
     handler: (accessor) => {
         navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
-            const fakeKeyboardEvent = ( (new KeyboardEvent('keydown')));
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown'));
             await widget.focusLast(fakeKeyboardEvent);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusAnyFirst',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 512  | 14 ,
+    primary: KeyMod.Alt | KeyCode.Home,
     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);
         });
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusAnyLast',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 512  | 13 ,
+    primary: KeyMod.Alt | KeyCode.End,
     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);
         });
     }
@@ -207,7 +208,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);
         }
@@ -219,10 +220,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();
@@ -231,16 +232,16 @@ function revealFocusedStickyScroll(tree, postRevealAction) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expandSelectionDown',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
-    primary: 1024  | 18 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey)),
+    primary: KeyMod.Shift | KeyCode.DownArrow,
     handler: (accessor, arg2) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
             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();
@@ -252,16 +253,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expandSelectionUp',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
-    primary: 1024  | 16 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey)),
+    primary: KeyMod.Shift | KeyCode.UpArrow,
     handler: (accessor, arg2) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
             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();
@@ -273,15 +274,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.collapse',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(
-        WorkbenchListFocusContextKey,
-         (ContextKeyExpr.or(WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent))
-    ))),
-    primary: 15 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, ( ContextKeyExpr.or(WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent)))),
+    primary: KeyCode.LeftArrow,
     mac: {
-        primary: 15 ,
-        secondary: [2048  | 16 ]
+        primary: KeyCode.LeftArrow,
+        secondary: [KeyMod.CtrlCmd | KeyCode.UpArrow]
     },
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -298,7 +296,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);
                 });
             }
@@ -307,12 +305,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.stickyScroll.collapse',
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     when: WorkbenchTreeStickyScrollFocused,
-    primary: 15 ,
+    primary: KeyCode.LeftArrow,
     mac: {
-        primary: 15 ,
-        secondary: [2048  | 16 ]
+        primary: KeyCode.LeftArrow,
+        secondary: [KeyMod.CtrlCmd | KeyCode.UpArrow]
     },
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -324,12 +322,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.collapseAll',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 2048  | 15 ,
+    primary: KeyMod.CtrlCmd | KeyCode.LeftArrow,
     mac: {
-        primary: 2048  | 15 ,
-        secondary: [2048  | 1024  | 16 ]
+        primary: KeyMod.CtrlCmd | KeyCode.LeftArrow,
+        secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow]
     },
     handler: (accessor) => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -340,7 +338,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.collapseAllToFocus',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -358,7 +356,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusParent',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -374,7 +372,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);
             });
         }
@@ -382,12 +380,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expand',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(
-        WorkbenchListFocusContextKey,
-         (ContextKeyExpr.or(WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild))
-    ))),
-    primary: 17 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, ( ContextKeyExpr.or(WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild)))),
+    primary: KeyCode.RightArrow,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
@@ -405,7 +400,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);
                         });
                     }
@@ -425,7 +420,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);
                             });
                         }
@@ -464,12 +459,12 @@ function selectElement(accessor, retainCurrentFocus) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.select',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 3 ,
+    primary: KeyCode.Enter,
     mac: {
-        primary: 3 ,
-        secondary: [2048  | 18 ]
+        primary: KeyCode.Enter,
+        secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow]
     },
     handler: (accessor) => {
         selectElement(accessor, false);
@@ -477,12 +472,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.stickyScrollselect',
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     when: WorkbenchTreeStickyScrollFocused,
-    primary: 3 ,
+    primary: KeyCode.Enter,
     mac: {
-        primary: 3 ,
-        secondary: [2048  | 18 ]
+        primary: KeyCode.Enter,
+        secondary: [KeyMod.CtrlCmd | KeyCode.DownArrow]
     },
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -494,7 +489,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.selectAndPreserveFocus',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         selectElement(accessor, true);
@@ -502,14 +497,14 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.selectAll',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
-    primary: 2048  | 31 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey)),
+    primary: KeyMod.CtrlCmd | KeyCode.KeyA,
     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) {
@@ -545,16 +540,16 @@ 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);
         }
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.toggleSelection',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 2048  | 1024  | 3 ,
+    primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
@@ -576,8 +571,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.showHover',
-    weight: 200 ,
-    primary: KeyChord(2048  | 41 , 2048  | 39 ),
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyI),
     when: WorkbenchListFocusContextKey,
     handler: async (accessor, ...args) => {
         const listService = accessor.get(IListService);
@@ -614,9 +609,9 @@ function getCustomHoverForElement(element) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.toggleExpand',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
-    primary: 10 ,
+    primary: KeyCode.Space,
     handler: (accessor) => {
         const focused = accessor.get(IListService).lastFocusedList;
         if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
@@ -632,9 +627,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.stickyScrolltoggleExpand',
-    weight: 200  + 50,
+    weight: KeybindingWeight.WorkbenchContrib + 50,
     when: WorkbenchTreeStickyScrollFocused,
-    primary: 10 ,
+    primary: KeyCode.Space,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget || !(widget instanceof ObjectTree || widget instanceof DataTree || widget instanceof AsyncDataTree)) {
@@ -645,16 +640,16 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.clear',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListHasSelectionOrFocus))),
-    primary: 9 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListHasSelectionOrFocus)),
+    primary: KeyCode.Escape,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
             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) {
@@ -703,10 +698,10 @@ CommandsRegistry.registerCommandAlias('list.toggleKeyboardNavigation', 'list.tri
 CommandsRegistry.registerCommandAlias('list.toggleFilterOnType', 'list.toggleFindMode');
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.find',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind))),
-    primary: 2048  | 512  | 36 ,
-    secondary: [61 ],
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind)),
+    primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.KeyF,
+    secondary: [KeyCode.F3],
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (widget instanceof List || widget instanceof PagedList || widget instanceof Table) ;
@@ -718,9 +713,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.closeFind',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen))),
-    primary: 9 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen)),
+    primary: KeyCode.Escape,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (widget instanceof AbstractTree || widget instanceof AsyncDataTree) {
@@ -731,9 +726,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollUp',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListScrollAtTopContextKey?.negate()))),
-    primary: 2048  | 16 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListScrollAtTopContextKey?.negate())),
+    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
         if (!focused) {
@@ -744,12 +739,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollDown',
-    weight: 200 ,
-    when: ( (ContextKeyExpr.and(
+    weight: KeybindingWeight.WorkbenchContrib,
+    when: ( ContextKeyExpr.and(
         WorkbenchListFocusContextKey,
         WorkbenchListScrollAtBottomContextKey?.negate()
-    ))),
-    primary: 2048  | 18 ,
+    )),
+    primary: KeyMod.CtrlCmd | KeyCode.DownArrow,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
         if (!focused) {
@@ -760,7 +755,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollLeft',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -772,7 +767,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollRight',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -787,12 +782,12 @@ registerAction2(class ToggleStickyScroll extends Action2 {
         super({
             id: 'tree.toggleStickyScroll',
             title: {
-                ...( localize2(4248, "Toggle Tree Sticky Scroll")),
-                mnemonicTitle: ( localize(4249, "&&Toggle Tree Sticky Scroll")),
+                ...( localize2(2602, "Toggle Tree Sticky Scroll")),
+                mnemonicTitle: ( localize(2603, "&&Toggle Tree Sticky Scroll")),
             },
             category: 'View',
             metadata: { description: ( localize(
-                4250,
+                2604,
                 "Toggles Sticky Scroll widget at the top of tree structures such as the File Explorer and Debug variables View."
             )) },
             f1: true

package/vscode/src/vs/workbench/browser/actions/navigationActions.d.ts

@@ -0,0 +1 @@
+export {};