Skip to content

fix: move cursor left on escape from insert mode #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
leohenon wants to merge 2 commits into from
Closed

fix: move cursor left on escape from insert mode #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
329d3a0
fix: move cursor left on escape from insert mode
leohenon Apr 23, 2026
eaf1145
trigger ci
leohenon Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/opencode/src/cli/cmd/tui/component/vim/vim-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,9 @@ export function createVimHandler(input: {
if (event.name !== "escape") return false
input.state.setMode("normal")
input.state.commitEdit(snapshot())
if (input.textarea().cursorOffset > 0 && input.textarea().plainText[input.textarea().cursorOffset - 1] !== "\n") {
input.textarea().cursorOffset = input.textarea().cursorOffset - 1
}
event.preventDefault()
return true
}
Expand Down
44 changes: 43 additions & 1 deletion packages/opencode/test/cli/tui/vim-motions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,7 @@ describe("vim motion handler", () => {

test("insert mode only handles escape", () => {
const ctx = createHandler("abc", { mode: "insert" })
ctx.textarea.cursorOffset = 2

const w = createEvent("w")
expect(ctx.handler.handleKey(w.event)).toBe(false)
Expand All @@ -887,6 +888,47 @@ describe("vim motion handler", () => {
expect(ctx.handler.handleKey(esc.event)).toBe(true)
expect(esc.prevented()).toBe(true)
expect(ctx.state.mode()).toBe("normal")
expect(ctx.textarea.cursorOffset).toBe(1)
})

test("escape from insert mode moves cursor back like vim", () => {
const ctx = createHandler("abcd")
ctx.textarea.cursorOffset = 1

ctx.handler.handleKey(createEvent("i").event)
ctx.textarea.insertText("X")
ctx.textarea.insertText("Y")
ctx.handler.handleKey(createEvent("escape").event)

expect(ctx.textarea.plainText).toBe("aXYbcd")
expect(ctx.textarea.cursorOffset).toBe(2)
expect(ctx.state.mode()).toBe("normal")
})

test("escape from insert mode stays on a new empty line", () => {
const ctx = createHandler("abc")
ctx.textarea.cursorOffset = 1

ctx.handler.handleKey(createEvent("o").event)
ctx.handler.handleKey(createEvent("escape").event)

expect(ctx.textarea.plainText).toBe("abc\n")
expect(ctx.textarea.cursorOffset).toBe(4)
expect(ctx.state.mode()).toBe("normal")
})

test("db after insert escape keeps the character under cursor like vim", () => {
const ctx = createHandler("")

ctx.handler.handleKey(createEvent("i").event)
ctx.textarea.insertText("word")
ctx.handler.handleKey(createEvent("escape").event)
expect(ctx.textarea.cursorOffset).toBe(3)

ctx.handler.handleKey(createEvent("d").event)
ctx.handler.handleKey(createEvent("b").event)
expect(ctx.textarea.plainText).toBe("d")
expect(ctx.textarea.cursorOffset).toBe(0)
})

test("R enters replace mode and escape exits", () => {
Expand Down Expand Up @@ -2499,7 +2541,7 @@ describe("vim undo redo", () => {

ctx.handler.handleKey(createEvent("u").event)
expect(ctx.textarea.plainText).toBe("hello")
expect(ctx.textarea.cursorOffset).toBe(5)
expect(ctx.textarea.cursorOffset).toBe(4)
})

test("redo is cleared after a new edit", () => {
Expand Down
Loading