+
{ inlineDiffsService.removeCtrlKZone({ diffareaid }) }}
+ onClick={onX}
/>
@@ -132,6 +137,12 @@ export const CtrlKChat = ({ diffareaid, onGetInputBox, onUserUpdateText, onChang
onChangeText={onChangeText}
onCreateInstance={useCallback((instance: InputBox) => {
inputBoxRef.current = instance;
+
+ // if presses the esc key, X
+ instance.element.addEventListener('keydown', (e) => {
+ if (e.key === 'Escape')
+ onX()
+ })
onGetInputBox(instance);
instance.focus()
}, [onGetInputBox])}
diff --git a/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/index.tsx b/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/index.tsx
similarity index 79%
rename from src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/index.tsx
rename to src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/index.tsx
index 4d59dbca..c3553893 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/ctrl-k-tsx/index.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/quick-edit-tsx/index.tsx
@@ -4,9 +4,9 @@
*--------------------------------------------------------------------------------------------*/
import { mountFnGenerator } from '../util/mountFnGenerator.js'
-import { CtrlK } from './CtrlK.js'
+import { QuickEdit } from './QuickEdit.js'
-export const mountCtrlK = mountFnGenerator(CtrlK)
+export const mountCtrlK = mountFnGenerator(QuickEdit)
diff --git a/src/vs/workbench/contrib/void/browser/react/tsup.config.js b/src/vs/workbench/contrib/void/browser/react/tsup.config.js
index 2a7547a0..9070f8e1 100644
--- a/src/vs/workbench/contrib/void/browser/react/tsup.config.js
+++ b/src/vs/workbench/contrib/void/browser/react/tsup.config.js
@@ -9,7 +9,7 @@ export default defineConfig({
entry: [
'./src2/sidebar-tsx/index.tsx',
'./src2/void-settings-tsx/index.tsx',
- './src2/ctrl-k-tsx/index.tsx',
+ './src2/quick-edit-tsx/index.tsx',
'./src2/diff/index.tsx',
],
outDir: './out',
diff --git a/src/vs/workbench/contrib/void/browser/sidebarActions.ts b/src/vs/workbench/contrib/void/browser/sidebarActions.ts
index 69508e18..bd1c753f 100644
--- a/src/vs/workbench/contrib/void/browser/sidebarActions.ts
+++ b/src/vs/workbench/contrib/void/browser/sidebarActions.ts
@@ -83,45 +83,45 @@ registerAction2(class extends Action2 {
)
+ // select whole lines
if (selectionRange) {
- // select whole lines
editor?.setSelection({ startLineNumber: selectionRange.startLineNumber, endLineNumber: selectionRange.endLineNumber, startColumn: 1, endColumn: Number.MAX_SAFE_INTEGER })
+ }
- const selectionStr = getContentInRange(model, selectionRange)
+ const selectionStr = getContentInRange(model, selectionRange)
- const selection: CodeStagingSelection = selectionStr === null || selectionRange.startLineNumber > selectionRange.endLineNumber ? {
- type: 'File',
- fileURI: model.uri,
- selectionStr: null,
- range: null,
- } : {
- type: 'Selection',
- fileURI: model.uri,
- selectionStr: selectionStr,
- range: selectionRange,
- }
+ const selection: CodeStagingSelection = !selectionRange || !selectionStr || (selectionRange.startLineNumber > selectionRange.endLineNumber) ? {
+ type: 'File',
+ fileURI: model.uri,
+ selectionStr: null,
+ range: null,
+ } : {
+ type: 'Selection',
+ fileURI: model.uri,
+ selectionStr: selectionStr,
+ range: selectionRange,
+ }
- // add selection to staging
- const threadHistoryService = accessor.get(IThreadHistoryService)
- const currentStaging = threadHistoryService.state._currentStagingSelections
- const currentStagingEltIdx = currentStaging?.findIndex(s =>
- s.fileURI.fsPath === model.uri.fsPath
- && s.range?.startLineNumber === selection.range?.startLineNumber
- && s.range?.endLineNumber === selection.range?.endLineNumber
- )
+ // add selection to staging
+ const threadHistoryService = accessor.get(IThreadHistoryService)
+ const currentStaging = threadHistoryService.state._currentStagingSelections
+ const currentStagingEltIdx = currentStaging?.findIndex(s =>
+ s.fileURI.fsPath === model.uri.fsPath
+ && s.range?.startLineNumber === selection.range?.startLineNumber
+ && s.range?.endLineNumber === selection.range?.endLineNumber
+ )
- // if matches with existing selection, overwrite
- if (currentStagingEltIdx !== undefined && currentStagingEltIdx !== -1) {
- threadHistoryService.setStaging([
- ...currentStaging!.slice(0, currentStagingEltIdx),
- selection,
- ...currentStaging!.slice(currentStagingEltIdx + 1, Infinity)
- ])
- }
- // if no match, add
- else {
- threadHistoryService.setStaging([...(currentStaging ?? []), selection])
- }
+ // if matches with existing selection, overwrite
+ if (currentStagingEltIdx !== undefined && currentStagingEltIdx !== -1) {
+ threadHistoryService.setStaging([
+ ...currentStaging!.slice(0, currentStagingEltIdx),
+ selection,
+ ...currentStaging!.slice(currentStagingEltIdx + 1, Infinity)
+ ])
+ }
+ // if no match, add
+ else {
+ threadHistoryService.setStaging([...(currentStaging ?? []), selection])
}
}