opencode-vim 0.0.4 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-vim",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "exports": {
     "./tui": {
       "import": "./tui.tsx"

package/src/modules/vim/index.tsx

@@ -1,8 +1,9 @@
 /** @jsxImportSource @opentui/solid */
+import type { KeyEvent, ParsedKey } from "@opentui/core"
 import { useKeyboard } from "@opentui/solid"
 import { onCleanup } from "solid-js"
 import type { PromptContext, PromptModule } from "../../prompt/types"
-import { applyVimCursorStyle } from "./actions"
+import { applyVimCursorStyle, focusedInput } from "./actions"
 import type { VimConfig } from "./config"
 import { createVimConfig } from "./config"
 import { keyNotation } from "./keys"
@@ -63,6 +64,19 @@ function VimKeyboard(props: { ctx: PromptContext; config: VimConfig; state: Retu
             return
         }
 
+        if (passThroughKey(event, key, props.state.mode())) {
+            preparePassThroughKey(props.ctx, key, props.state.mode())
+            syncCursorStyle(true)
+            props.ctx.requestRender()
+            return
+        }
+
+        if (sendNavigationKey(event, props.ctx, key, props.state.mode())) {
+            syncCursorStyle(true)
+            props.ctx.requestRender()
+            return
+        }
+
         const consumed = vimee.handle(event, key, props.ctx)
         if (consumed) {
             event.preventDefault()
@@ -94,3 +108,74 @@ function readablePending(sequence: string) {
     if (!sequence) return undefined
     return sequence.replaceAll("><", " ")
 }
+
+function passThroughKey(event: KeyEvent, key: string, mode: string) {
+    if (mode !== "normal") return false
+    return event.super === true || isArrowKey(key) || key === "<CR>" || key === "<C-c>"
+}
+
+function preparePassThroughKey(ctx: PromptContext, key: string, mode: string) {
+    if (mode !== "normal" || key !== "<CR>") return
+    const input = focusedInput(ctx)
+    if (!input?.plainText || input.cursorOffset === undefined) return
+    input.cursorOffset = Math.min(input.cursorOffset + 1, input.plainText.length)
+}
+
+function sendNavigationKey(event: KeyEvent, ctx: PromptContext, key: string, mode: string) {
+    if (mode !== "normal") return false
+    const forwarded = commandNavigationKey(ctx, key)
+    if (!forwarded) return false
+
+    event.preventDefault()
+    event.stopPropagation()
+    ctx.api.renderer.keyInput.processParsedKey(forwarded)
+    return true
+}
+
+function commandNavigationKey(ctx: PromptContext, key: string): ParsedKey | undefined {
+    if (!isPromptFocused(ctx)) return navigationKey(key)
+    if (!isSlashCommandToken(ctx)) return undefined
+    if (key === "j") return arrowKey("down", "\u001B[B")
+    if (key === "k") return arrowKey("up", "\u001B[A")
+    return undefined
+}
+
+function isPromptFocused(ctx: PromptContext) {
+    return ctx.prompt()?.focused === true && !!focusedInput(ctx)
+}
+
+function isSlashCommandToken(ctx: PromptContext) {
+    const text = ctx.prompt()?.current.input ?? focusedInput(ctx)?.plainText ?? ""
+    if (!text.startsWith("/")) return false
+    const input = focusedInput(ctx)
+    const offset = Math.max(0, input?.cursorOffset ?? text.length)
+    return !/\s/.test(text.slice(0, Math.min(offset + 1, text.length)))
+}
+
+function navigationKey(key: string): ParsedKey | undefined {
+    if (key === "h") return arrowKey("left", "\u001B[D")
+    if (key === "j") return arrowKey("down", "\u001B[B")
+    if (key === "k") return arrowKey("up", "\u001B[A")
+    if (key === "l") return arrowKey("right", "\u001B[C")
+    return undefined
+}
+
+function isArrowKey(key: string) {
+    return key === "<Left>" || key === "<Down>" || key === "<Up>" || key === "<Right>"
+}
+
+function arrowKey(name: string, sequence: string): ParsedKey {
+    return {
+        name,
+        ctrl: false,
+        meta: false,
+        shift: false,
+        option: false,
+        sequence,
+        number: false,
+        raw: sequence,
+        eventType: "press",
+        source: "raw",
+        super: false,
+    }
+}

package/src/modules/vim/vimee.ts

@@ -149,7 +149,7 @@ export function createVimeeAdapter(state: VimState, config: VimConfig, log: VimL
 
     function handleInsertMode(event: KeyEvent, key: string, ctx: PromptContext, map: PromptMap, cursor: CursorPosition, offset: number) {
         if (key === "Escape") {
-            cancelPendingInsert(ctx, offset)
+            cancelPendingInsert(ctx, offset, false)
             sync(map, cursor)
             const result = processKeystroke(key, vim, buffer, event.ctrl, false)
             vim = result.newCtx
@@ -221,12 +221,12 @@ export function createVimeeAdapter(state: VimState, config: VimConfig, log: VimL
         }, config.keymapTimeout)
     }
 
-    function cancelPendingInsert(ctx: PromptContext, offset?: number) {
+    function cancelPendingInsert(ctx: PromptContext, offset?: number, flush = true) {
         if (!keybinds?.isPending()) return
         if (timer) clearTimeout(timer)
         timer = undefined
         keybinds.cancel()
-        flushPendingInsert(ctx, pendingInsert, offset)
+        if (flush) flushPendingInsert(ctx, pendingInsert, offset)
         pendingInsert = ""
         state.setPending("")
     }