fix: remove yy

Author: BrettKulp

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

@@ -92,7 +92,6 @@ export type PromptProps = {
     exit: (scrollToBottom?: boolean) => void
     visual: (mode: "char" | "line") => void
     yank: () => { text: string; linewise: boolean } | null
-    yankLine: () => { text: string; linewise: boolean } | null
     copy: () => Promise<void> | void
     isVisual: () => boolean
     exitVisual: () => void
@@ -455,10 +454,6 @@ export function Prompt(props: PromptProps) {
       const reg = props.copy?.yank()
       if (reg) vimState.setRegister(reg)
     },
-    copyYankLine() {
-      const reg = props.copy?.yankLine()
-      if (reg) vimState.setRegister(reg)
-    },
     copyCopy() {
       return props.copy?.copy()
     },

packages/opencode/src/cli/cmd/tui/component/vim/vim-handler.ts

@@ -42,11 +42,7 @@ import {
   toggleCase,
   toggleSelectionCase,
   wordEnd,
-  yankLine,
-  yankLineSpan,
   yankSelection,
-  yankWord,
-  yankWordSpan,
 } from "./vim-motions"
 
 export type VimEvent = {
@@ -73,7 +69,6 @@ export function createVimHandler(input: {
   copyExitVisual?: () => void
   copyExit?: (scrollToBottom?: boolean) => void
   copyYank?: () => void
-  copyYankLine?: () => void
   copyCopy?: () => void
   copyIsVisual?: () => boolean
   copyJump?: (action: VimJump) => void
@@ -376,35 +371,6 @@ export function createVimHandler(input: {
       input.state.clearPending()
     }
 
-    if (input.state.pending() === "y") {
-      if (key === "y" && !event.shift && !hasModifier(event)) {
-        const span = yankLineSpan(input.textarea())
-        const reg = yankLine(input.textarea())
-        if (reg) input.state.setRegister(reg)
-        if (span.end > span.start) input.flash?.(span)
-        input.state.clearPending()
-        event.preventDefault()
-        return true
-      }
-
-      if (key === "w" && !event.shift && !hasModifier(event)) {
-        const span = yankWordSpan(input.textarea())
-        const reg = yankWord(input.textarea())
-        if (reg) input.state.setRegister(reg)
-        if (span && span.end > span.start) input.flash?.(span)
-        input.state.clearPending()
-        event.preventDefault()
-        return true
-      }
-
-      if (hasModifier(event)) {
-        input.state.clearPending()
-        return false
-      }
-
-      input.state.clearPending()
-    }
-
     const find = input.state.pending()
     if (find === "f" || find === "F" || find === "t" || find === "T") {
       if (isPrintable(event) && !hasModifier(event)) {
@@ -449,12 +415,6 @@ export function createVimHandler(input: {
       return true
     }
 
-    if (key === "y" && !event.shift && !hasModifier(event)) {
-      input.state.setPending("y")
-      event.preventDefault()
-      return true
-    }
-
     if (key === "p" && !event.shift && !hasModifier(event)) {
       edit(() => {
         pasteAfter(input.textarea(), input.state.register())
@@ -836,23 +796,9 @@ export function createVimHandler(input: {
       return true
     }
 
-    if (key === "y" && input.state.pending() === "y") {
-      // yy — yank current line with flash highlight
-      input.state.clearPending()
-      input.copyYankLine?.()
-      event.preventDefault()
-      return true
-    }
-
     if (key === "y") {
-      if (!input.copyIsVisual?.()) {
-        // first y — set pending for yy
-        input.state.setPending("y")
-      } else {
-        // y in visual — yank selection, flash highlight then clear
-        input.copyYank?.()
-        setTimeout(() => input.copyExitVisual?.(), 150)
-      }
+      input.copyYank?.()
+      input.state.setMode("normal")
       event.preventDefault()
       return true
     }

packages/opencode/src/cli/cmd/tui/component/vim/vim-state.ts

@@ -1,7 +1,7 @@
 import { createEffect, createMemo, createSignal, type Accessor } from "solid-js"
 
 export type VimMode = "normal" | "insert" | "replace" | "visual" | "visual-line" | "copy"
-export type VimPending = "" | "c" | "d" | "g" | "z" | "f" | "F" | "t" | "T" | "y" | "w"
+export type VimPending = "" | "c" | "d" | "g" | "z" | "f" | "F" | "t" | "T" | "w"
 export type VimFind = { char: string; forward: boolean; till: boolean } | null
 export type VimRegister = { text: string; linewise: boolean } | null
 export type VimSnapshot = { text: string; cursor: number; data?: unknown }

packages/opencode/src/cli/cmd/tui/routes/session/copy-mode.ts

@@ -490,19 +490,6 @@ export function createCopyMode(input: {
     setState((s) => ({ ...s, visual: undefined, anchor: undefined }))
   }
 
-  let yankFlashTimer: ReturnType<typeof setTimeout> | undefined
-  function yankLine() {
-    visual("line")
-    const reg = yank()
-    // Keep the highlight visible briefly, then clear
-    if (yankFlashTimer) clearTimeout(yankFlashTimer)
-    yankFlashTimer = setTimeout(() => {
-      yankFlashTimer = undefined
-      exitVisual()
-    }, 150)
-    return reg
-  }
-
   function selectionText(): string {
     const s = state()
     if (!s.visual || !s.anchor) return ""
@@ -701,7 +688,6 @@ export function createCopyMode(input: {
       exit: (scrollToBottom?: boolean) => exit(scrollToBottom),
       visual,
       yank,
-      yankLine,
       copy,
       isVisual: () => !!state().visual,
       exitVisual,

packages/opencode/test/cli/tui/vim-motions.test.ts

@@ -301,10 +301,6 @@ function createHandler(
       copyYanks++
       state.setRegister({ text: options?.copy?.text ?? "picked", linewise: false })
     },
-    copyYankLine() {
-      copyYanks++
-      state.setRegister({ text: options?.copy?.text ?? "picked line", linewise: true })
-    },
     copyExit(scrollToBottom) {
       copyExits.push(scrollToBottom)
     },
@@ -2647,7 +2643,7 @@ describe("copy mode", () => {
     expect(ctx.copyVisualCalls).not.toContain("char")
   })
 
-  test("y yanks copy selection and stays in copy mode", () => {
+  test("y yanks copy selection and exits copy mode", () => {
     const ctx = createHandler("abc", { mode: "copy", copy: { text: "picked text", isVisual: true } })
 
     const evt = createEvent("y")
@@ -2656,7 +2652,7 @@ describe("copy mode", () => {
     expect(ctx.copyYanks()).toBe(1)
     expect(ctx.copyCopies()).toBe(0)
     expect(ctx.state.register()).toEqual({ text: "picked text", linewise: false })
-    expect(ctx.state.mode()).toBe("copy")
+    expect(ctx.state.mode()).toBe("normal")
   })
 
   test("return copies selection to clipboard path and exits copy mode", () => {
@@ -2880,35 +2876,6 @@ describe("copy mode", () => {
     expect(ctx.copyExits).toEqual([false])
   })
 
-  test("y in visual mode yanks and exits visual but stays in copy mode", () => {
-    const ctx = createHandler("abc", { mode: "copy", copy: { text: "selected", isVisual: true } })
-    const evt = createEvent("y")
-    expect(ctx.handler.handleKey(evt.event)).toBe(true)
-    expect(ctx.copyYanks()).toBe(1)
-    expect(ctx.state.register()).toEqual({ text: "selected", linewise: false })
-    expect(ctx.state.mode()).toBe("copy")
-  })
-
-  test("y without visual sets pending y for yy", () => {
-    const ctx = createHandler("abc", { mode: "copy" })
-    const evt = createEvent("y")
-    expect(ctx.handler.handleKey(evt.event)).toBe(true)
-    expect(ctx.state.pending()).toBe("y")
-    expect(ctx.copyYanks()).toBe(0)
-    expect(ctx.state.mode()).toBe("copy")
-  })
-
-  test("yy yanks current line and stays in copy mode", () => {
-    const ctx = createHandler("abc", { mode: "copy", copy: { text: "whole line" } })
-    ctx.handler.handleKey(createEvent("y").event)
-    expect(ctx.state.pending()).toBe("y")
-    ctx.handler.handleKey(createEvent("y").event)
-    expect(ctx.state.pending()).toBe("")
-    expect(ctx.copyYanks()).toBe(1)
-    expect(ctx.state.register()).toEqual({ text: "whole line", linewise: true })
-    expect(ctx.state.mode()).toBe("copy")
-  })
-
   test("Ctrl+W j from visual in copy mode exits visual not copy", () => {
     const ctx = createHandler("abc", { mode: "copy", copy: { isVisual: true } })
     ctx.handler.handleKey(createEvent("w", { ctrl: true }).event)