From 7dec57ae04a0d1d4b11bf7217ce26f7fa782a08d Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Wed, 15 Jan 2025 19:24:08 -0800 Subject: [PATCH] add high priority to void keybinds --- .../platform/keybinding/common/keybindingsRegistry.ts | 3 ++- .../workbench/contrib/void/browser/quickEditActions.ts | 6 ++++-- .../void/browser/react/src/sidebar-tsx/SidebarChat.tsx | 2 +- .../workbench/contrib/void/browser/sidebarActions.ts | 10 +++++++++- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts index eeabcc55..c8639cbf 100644 --- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts +++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts @@ -64,7 +64,8 @@ export const enum KeybindingWeight { EditorContrib = 100, WorkbenchContrib = 200, BuiltinExtension = 300, - ExternalExtension = 400 + ExternalExtension = 400, + VoidExtension = 500, // Void - must trump any external extension } export interface ICommandAndKeybindingRule extends IKeybindingRule { diff --git a/src/vs/workbench/contrib/void/browser/quickEditActions.ts b/src/vs/workbench/contrib/void/browser/quickEditActions.ts index 125e983c..1498c8f6 100644 --- a/src/vs/workbench/contrib/void/browser/quickEditActions.ts +++ b/src/vs/workbench/contrib/void/browser/quickEditActions.ts @@ -12,6 +12,7 @@ import { ICodeEditorService } from '../../../../editor/browser/services/codeEdit import { IInlineDiffsService } from './inlineDiffsService.js'; import { roundRangeToLines } from './sidebarActions.js'; import { VOID_CTRL_K_ACTION_ID } from './actionIDs.js'; +import { localize2 } from '../../../../nls.js'; export type QuickEditPropsType = { @@ -37,10 +38,11 @@ registerAction2(class extends Action2 { ) { super({ id: VOID_CTRL_K_ACTION_ID, - title: 'Void: Quick Edit', + f1: true, + title: localize2('voidQuickEditAction', 'Void: Quick Edit'), keybinding: { primary: KeyMod.CtrlCmd | KeyCode.KeyK, - weight: KeybindingWeight.BuiltinExtension, + weight: KeybindingWeight.VoidExtension, } }); } diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx index c41c6702..06a1c4ae 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx @@ -625,7 +625,7 @@ export const SidebarChat = () => { {/* text input */} { setInstructionsAreEmpty(!newStr) }, [setInstructionsAreEmpty])} onKeyDown={(e) => { if (e.key === 'Enter' && !e.shiftKey) { diff --git a/src/vs/workbench/contrib/void/browser/sidebarActions.ts b/src/vs/workbench/contrib/void/browser/sidebarActions.ts index d33df07d..3b260158 100644 --- a/src/vs/workbench/contrib/void/browser/sidebarActions.ts +++ b/src/vs/workbench/contrib/void/browser/sidebarActions.ts @@ -153,7 +153,15 @@ registerAction2(class extends Action2 { registerAction2(class extends Action2 { constructor() { - super({ id: VOID_CTRL_L_ACTION_ID, title: 'Void: Press Ctrl+L', keybinding: { primary: KeyMod.CtrlCmd | KeyCode.KeyL, weight: KeybindingWeight.BuiltinExtension } }); + super({ + id: VOID_CTRL_L_ACTION_ID, + f1: true, + title: localize2('voidCtrlL', 'Void: Add Select to Chat'), + keybinding: { + primary: KeyMod.CtrlCmd | KeyCode.KeyL, + weight: KeybindingWeight.VoidExtension + } + }); } async run(accessor: ServicesAccessor): Promise { const commandService = accessor.get(ICommandService)