From a53f92432b318a55b8697a8759382384704b23cb Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Tue, 7 Jan 2025 19:45:41 -0800
Subject: [PATCH] keybinding for ctrl+L and ctrl+K shows accurately even if
 user changes it

---
 .../contrib/void/browser/helpers/getCmdKey.ts | 20 -------------------
 .../src/quick-edit-tsx/QuickEditChat.tsx      | 10 +++++++---
 .../react/src/sidebar-tsx/SidebarChat.tsx     |  6 ++++--
 .../void/browser/react/src/util/services.tsx  |  2 ++
 4 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 src/vs/workbench/contrib/void/browser/helpers/getCmdKey.ts

diff --git a/src/vs/workbench/contrib/void/browser/helpers/getCmdKey.ts b/src/vs/workbench/contrib/void/browser/helpers/getCmdKey.ts
deleted file mode 100644
index fe520e42..00000000
--- a/src/vs/workbench/contrib/void/browser/helpers/getCmdKey.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Glass Devtools, Inc. All rights reserved.
- *  Void Editor additions licensed under the AGPL 3.0 License.
- *--------------------------------------------------------------------------------------------*/
-
-import { isMacintosh } from '../../../../../base/common/platform.js';
-
-// import { OperatingSystem, OS } from '../../../../base/common/platform.js';
-// OS === OperatingSystem.Macintosh
-export function getCmdKey(): string {
-	if (isMacintosh) {
-		return '⌘';
-	} else {
-		return 'Ctrl';
-	}
-}
-
-
-
-
diff --git a/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx
index 26bbc9f9..4d67a861 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/QuickEditChat.tsx
@@ -7,9 +7,8 @@ import React, { FormEvent, useCallback, useEffect, useRef, useState } from 'reac
 import { useSettingsState, useSidebarState, useThreadsState, useQuickEditState, useAccessor } from '../util/services.js';
 import { OnError } from '../../../../../../../platform/void/common/llmMessageTypes.js';
 import { InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js';
-import { getCmdKey } from '../../../helpers/getCmdKey.js';
 import { VoidInputBox } from '../util/inputs.js';
-import { QuickEditPropsType } from '../../../quickEditActions.js';
+import { QuickEditPropsType, VOID_CTRL_K_ACTION_ID } from '../../../quickEditActions.js';
 import { ButtonStop, ButtonSubmit } from '../sidebar-tsx/SidebarChat.js';
 import { ModelDropdown } from '../void-settings-tsx/ModelDropdown.js';
 import { X } from 'lucide-react';
@@ -72,6 +71,7 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC
 		inlineDiffsService.removeCtrlKZone({ diffareaid })
 	}, [inlineDiffsService, diffareaid])
 
+
 	// sync init value
 	const alreadySetRef = useRef(false)
 	useEffect(() => {
@@ -81,6 +81,10 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC
 		inputBoxRef.current.value = instructions
 	}, [initText, instructions])
 
+	const keybindingString = accessor.get('IKeybindingService').lookupKeybinding(VOID_CTRL_K_ACTION_ID)?.getLabel()
+
+
+
 	return <div ref={sizerRef} className='py-2 w-full max-w-xl'>
 		<form
 			// copied from SidebarChat.tsx
@@ -128,7 +132,7 @@ export const QuickEditChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onC
 							@@[&_textarea]:!void-bg-transparent @@[&_textarea]:!void-outline-none @@[&_textarea]:!void-text-vscode-input-fg @@[&_div.monaco-inputbox]:!void-outline-none`}>
 						{/* text input */}
 						<VoidInputBox
-							placeholder={`${getCmdKey()}+K to select`}
+							placeholder={`${keybindingString} to select`}
 							onChangeText={onChangeText}
 							onCreateInstance={useCallback((instance: InputBox) => {
 								inputBoxRef.current = instance;
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 e1fc9fc4..329724d6 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
@@ -16,7 +16,6 @@ import { EndOfLinePreference } from '../../../../../../../editor/common/model.js
 import { IDisposable } from '../../../../../../../base/common/lifecycle.js';
 import { ErrorDisplay } from './ErrorDisplay.js';
 import { OnError, ServiceSendLLMMessageParams } from '../../../../../../../platform/void/common/llmMessageTypes.js';
-import { getCmdKey } from '../../../helpers/getCmdKey.js'
 import { HistoryInputBox, InputBox } from '../../../../../../../base/browser/ui/inputbox/inputBox.js';
 import { VoidInputBox } from '../util/inputs.js';
 import { ModelDropdown } from '../void-settings-tsx/ModelDropdown.js';
@@ -26,6 +25,7 @@ import { ILLMMessageService } from '../../../../../../../platform/void/common/ll
 import { IModelService } from '../../../../../../../editor/common/services/model.js';
 import { SidebarThreadSelector } from './SidebarThreadSelector.js';
 import { useScrollbarStyles } from '../util/useScrollbarStyles.js';
+import { VOID_CTRL_L_ACTION_ID } from '../../../sidebarActions.js';
 
 
 const IconX = ({ size, className = '', ...props }: { size: number, className?: string } & React.SVGProps<SVGSVGElement>) => {
@@ -577,6 +577,8 @@ export const SidebarChat = () => {
 
 	// const [_test_messages, _set_test_messages] = useState<string[]>([])
 
+	const keybindingString = accessor.get('IKeybindingService').lookupKeybinding(VOID_CTRL_L_ACTION_ID)?.getLabel()
+
 	return <div
 		ref={sidebarRef}
 		className={`w-full h-full`}
@@ -675,7 +677,7 @@ export const SidebarChat = () => {
 
 					{/* text input */}
 					<VoidInputBox
-						placeholder={`${getCmdKey()}+L to select`}
+						placeholder={`${keybindingString} to select`}
 						onChangeText={onChangeText}
 						inputBoxRef={inputBoxRef}
 						multiline={true}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx b/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx
index 88eb4cef..c083216a 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/util/services.tsx
@@ -40,6 +40,7 @@ import { IAccessibilityService } from '../../../../../../../platform/accessibili
 import { ILanguageConfigurationService } from '../../../../../../../editor/common/languages/languageConfigurationRegistry.js'
 import { ILanguageFeaturesService } from '../../../../../../../editor/common/services/languageFeatures.js'
 import { ILanguageDetectionService } from '../../../../../../services/languageDetection/common/languageDetectionWorkerService.js'
+import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js'
 
 
 
@@ -173,6 +174,7 @@ const getReactAccessor = (accessor: ServicesAccessor) => {
 		ILanguageConfigurationService: accessor.get(ILanguageConfigurationService),
 		ILanguageDetectionService: accessor.get(ILanguageDetectionService),
 		ILanguageFeaturesService: accessor.get(ILanguageFeaturesService),
+		IKeybindingService: accessor.get(IKeybindingService),
 
 	} as const
 	return reactAccessor