A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: arrow keys lose selection in vim visual mode (#9172)
Kiran Gadhavef41deed60d93
diff --git a/frontend/src/core/codemirror/__tests__/__snapshots__/setup.test.ts.snap b/frontend/src/core/codemirror/__tests__/__snapshots__/setup.test.ts.snapindex 65a7e99385..6b8ad4e869 100644--- a/frontend/src/core/codemirror/__tests__/__snapshots__/setup.test.ts.snap+++ b/frontend/src/core/codemirror/__tests__/__snapshots__/setup.test.ts.snap@@ -9,9 +9,7 @@ exports[`snapshot all duplicate keymaps > default keymaps 2`] = `},{"key": "ArrowDown",- "preventDefault": true,"run": "run",- "stopPropagation": true,},{"key": "ArrowDown",@@ -27,9 +25,7 @@ exports[`snapshot all duplicate keymaps > default keymaps 2`] = `},{"key": "ArrowUp",- "preventDefault": true,"run": "run",- "stopPropagation": true,},{"key": "ArrowUp",@@ -118,15 +114,12 @@ exports[`snapshot all duplicate keymaps > vim keymaps 2`] = `},{"key": "ArrowDown",- "preventDefault": true,"run": "run",- "stopPropagation": true,},{"key": "ArrowDown",- "preventDefault": true,- "run": "cursorLineDown",- "shift": "selectLineDown",+ "run": "<no name>",+ "shift": "<no name>",},],"ArrowUp": [@@ -136,15 +129,12 @@ exports[`snapshot all duplicate keymaps > vim keymaps 2`] = `},{"key": "ArrowUp",- "preventDefault": true,"run": "run",- "stopPropagation": true,},{"key": "ArrowUp",- "preventDefault": true,- "run": "cursorLineUp",- "shift": "selectLineUp",+ "run": "<no name>",+ "shift": "<no name>",},],"Backspace": [diff --git a/frontend/src/core/codemirror/cells/extensions.ts b/frontend/src/core/codemirror/cells/extensions.tsindex 159a4505ee..b4c599bfd7 100644--- a/frontend/src/core/codemirror/cells/extensions.ts+++ b/frontend/src/core/codemirror/cells/extensions.ts@@ -169,8 +169,6 @@ function cellKeymaps({},{key: "ArrowUp",- preventDefault: true,- stopPropagation: true,run: (ev) => {// Skip if we are in the middle of an autocompletionconst hasAutocomplete = completionStatus(ev.state);@@ -188,8 +186,6 @@ function cellKeymaps({},{key: "ArrowDown",- preventDefault: true,- stopPropagation: true,run: (ev) => {// Skip if we are in the middle of an autocompletionconst hasAutocomplete = completionStatus(ev.state);diff --git a/frontend/src/core/codemirror/keymaps/keymaps.ts b/frontend/src/core/codemirror/keymaps/keymaps.tsindex 42cd71144a..956e40648f 100644--- a/frontend/src/core/codemirror/keymaps/keymaps.ts+++ b/frontend/src/core/codemirror/keymaps/keymaps.ts@@ -1,8 +1,16 @@/* Copyright 2026 Marimo. All rights reserved. */import {+ cursorCharLeft,+ cursorCharRight,+ cursorLineDown,+ cursorLineUp,insertNewlineAndIndent,defaultKeymap as originalDefaultKeymap,+ selectCharLeft,+ selectCharRight,+ selectLineDown,+ selectLineUp,toggleBlockComment,toggleComment,} from "@codemirror/commands";@@ -13,7 +21,7 @@ import {type KeyBinding,keymap,} from "@codemirror/view";-import { getCM, vim } from "@replit/codemirror-vim";+import { type CodeMirror, getCM, vim } from "@replit/codemirror-vim";import type { KeymapConfig } from "@/core/config/config-schema";import type { HotkeyProvider } from "@/core/hotkeys/hotkeys";import { logNever } from "@/utils/assertNever";@@ -62,6 +70,12 @@ export function keymapBundle(},),),+ // Arrow keys: use CodeMirror's cursor movement except in vim visual+ // mode, where vim must handle them to maintain selection.+ // The original cursorLineUp/Down bindings from the default keymap are+ // filtered out (see defaultVimKeymap) because their preventDefault+ // flag blocks vim's handler even when their run function returns false.+ keymap.of(vimVisualModeArrowKeyBindings()),// Base vim modevim({ status: false }),// Custom vim keymaps for cell navigation@@ -101,12 +115,22 @@ const overrideKeymap = (keymap: HotkeyProvider): readonly KeyBinding[] => {};const defaultVimKeymap = once(() => {- const toRemove = new Set(["Enter", "Ctrl-v"]);+ const toRemove = new Set([+ "Enter",+ "Ctrl-v",+ "ArrowUp",+ "ArrowDown",+ "ArrowLeft",+ "ArrowRight",+ ]);// Remove conflicting keys from the keymap// Enter (<CR>) adds a new line// - it should just go to the next line// Ctrl-v goes to the bottom of the cell// - should enter blockwise visual mode+ // ArrowUp/ArrowDown (cursorLineUp/Down) always handle the event and have+ // preventDefault, which blocks vim's handler from processing arrow keys.+ // Replaced with visual-mode-aware wrappers in keymapBundle.return defaultKeymap().filter((k) => !toRemove.has(k.key || k.mac || k.linux || k.win || ""),);@@ -155,6 +179,49 @@ function doubleCharacterListener(]);}+function isInVimVisualMode(cm: CodeMirror | undefined | null): boolean {+ return cm?.state.vim?.visualMode === true;+}++/**+ * In vim visual mode, arrow keys must be handled by vim to maintain selection.+ * Wrap each arrow key's run and shift so they defer to vim in visual mode,+ * but use CodeMirror's cursor commands in all other modes.+ */+function vimVisualModeArrowKeyBindings(): KeyBinding[] {+ const wrap =+ (cmd: Command): Command =>+ (view) => {+ if (isInVimVisualMode(getCM(view))) {+ return false;+ }+ return cmd(view);+ };++ return [+ {+ key: "ArrowDown",+ run: wrap(cursorLineDown),+ shift: wrap(selectLineDown),+ },+ {+ key: "ArrowUp",+ run: wrap(cursorLineUp),+ shift: wrap(selectLineUp),+ },+ {+ key: "ArrowLeft",+ run: wrap(cursorCharLeft),+ shift: wrap(selectCharLeft),+ },+ {+ key: "ArrowRight",+ run: wrap(cursorCharRight),+ shift: wrap(selectCharRight),+ },+ ];+}+export const visibleForTesting = {defaultKeymap,defaultVimKeymap,