@codingame/monaco-vscode-view-common-service-override 5.3.0 → 6.0.1

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

@@ -1,4 +1,5 @@
-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';
@@ -15,6 +16,7 @@ import { isActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 const _moduleId = "vs/workbench/browser/actions/listCommands";
 function ensureDOMFocus(widget) {
@@ -51,12 +53,12 @@ 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) => {
@@ -67,12 +69,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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) => {
@@ -83,12 +85,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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) => {
@@ -99,12 +101,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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) => {
@@ -115,9 +117,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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')));
@@ -127,9 +129,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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')));
@@ -139,9 +141,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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')));
@@ -151,9 +153,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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')));
@@ -163,9 +165,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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 })));
@@ -175,9 +177,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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 })));
@@ -230,9 +232,9 @@ function revealFocusedStickyScroll(tree, postRevealAction) {
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expandSelectionDown',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
-    primary: 1024  | 18 ,
+    primary: KeyMod.Shift | KeyCode.DownArrow,
     handler: (accessor, arg2) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
@@ -251,9 +253,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expandSelectionUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
-    primary: 1024  | 16 ,
+    primary: KeyMod.Shift | KeyCode.UpArrow,
     handler: (accessor, arg2) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
@@ -272,15 +274,15 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.collapse',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(
         WorkbenchListFocusContextKey,
          (ContextKeyExpr.or(WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent))
     ))),
-    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;
@@ -306,12 +308,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;
@@ -323,12 +325,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;
@@ -339,7 +341,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.collapseAllToFocus',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -357,7 +359,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusParent',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -381,12 +383,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expand',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(
         WorkbenchListFocusContextKey,
          (ContextKeyExpr.or(WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild))
     ))),
-    primary: 17 ,
+    primary: KeyCode.RightArrow,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
@@ -463,12 +465,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);
@@ -476,12 +478,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;
@@ -493,7 +495,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.selectAndPreserveFocus',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         selectElement(accessor, true);
@@ -501,9 +503,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.selectAll',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListSupportsMultiSelectContextKey))),
-    primary: 2048  | 31 ,
+    primary: KeyMod.CtrlCmd | KeyCode.KeyA,
     handler: (accessor) => {
         const focused = accessor.get(IListService).lastFocusedList;
         if (focused instanceof List || focused instanceof PagedList || focused instanceof Table) {
@@ -551,9 +553,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 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) {
@@ -573,11 +575,49 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.showHover',
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyChord(KeyMod.CtrlCmd | KeyCode.KeyK, KeyMod.CtrlCmd | KeyCode.KeyI),
+    when: WorkbenchListFocusContextKey,
+    handler: async (accessor, ...args) => {
+        const listService = accessor.get(IListService);
+        const lastFocusedList = listService.lastFocusedList;
+        if (!lastFocusedList) {
+            return;
+        }
+        const focus = lastFocusedList.getFocus();
+        if (!focus || (focus.length === 0)) {
+            return;
+        }
+        const treeDOM = lastFocusedList.getHTMLElement();
+        const scrollableElement = treeDOM.querySelector('.monaco-scrollable-element');
+        const listRows = scrollableElement?.querySelector('.monaco-list-rows');
+        const focusedElement = listRows?.querySelector('.focused');
+        if (!focusedElement) {
+            return;
+        }
+        const elementWithHover = getCustomHoverForElement(focusedElement);
+        if (elementWithHover) {
+            accessor.get(IHoverService).triggerUpdatableHover(elementWithHover);
+        }
+    },
+});
+function getCustomHoverForElement(element) {
+    if (element.matches('[custom-hover="true"]')) {
+        return element;
+    }
+    const noneFocusableElementWithHover = element.querySelector('[custom-hover="true"]:not([tabindex]):not(.action-item)');
+    if (noneFocusableElementWithHover) {
+        return noneFocusableElementWithHover;
+    }
+    return undefined;
+}
 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) {
@@ -593,9 +633,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)) {
@@ -606,9 +646,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.clear',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListHasSelectionOrFocus))),
-    primary: 9 ,
+    primary: KeyCode.Escape,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (!widget) {
@@ -664,10 +704,10 @@ CommandsRegistry.registerCommandAlias('list.toggleKeyboardNavigation', 'list.tri
 CommandsRegistry.registerCommandAlias('list.toggleFilterOnType', 'list.toggleFindMode');
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.find',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind))),
-    primary: 2048  | 512  | 36 ,
-    secondary: [61 ],
+    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) ;
@@ -679,9 +719,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.closeFind',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchTreeFindOpen))),
-    primary: 9 ,
+    primary: KeyCode.Escape,
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
         if (widget instanceof AbstractTree || widget instanceof AsyncDataTree) {
@@ -692,9 +732,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollUp',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.and(WorkbenchListFocusContextKey, WorkbenchListScrollAtTopContextKey?.negate()))),
-    primary: 2048  | 16 ,
+    primary: KeyMod.CtrlCmd | KeyCode.UpArrow,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
         if (!focused) {
@@ -705,12 +745,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollDown',
-    weight: 200 ,
+    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) {
@@ -721,7 +761,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollLeft',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;
@@ -733,7 +773,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.scrollRight',
-    weight: 200 ,
+    weight: KeybindingWeight.WorkbenchContrib,
     when: WorkbenchListFocusContextKey,
     handler: accessor => {
         const focused = accessor.get(IListService).lastFocusedList;