ep_vim 0.9.1 → 0.9.2

package/static/js/index.js

@@ -20,38 +20,40 @@ const {
   getVisualSelection,
   paragraphTextRange,
   sentenceTextRange,
-  getFullText,
-  posToAbsolute,
-  absoluteToPos,
   searchForward,
   searchBackward,
 } = require("./vim-core");
 
 // --- State ---
 
-let vimEnabled = localStorage.getItem("ep_vimEnabled") === "true";
-let mode = "normal";
-let pendingKey = null;
-let pendingCount = null;
-let countBuffer = "";
-let register = null;
-let marks = {};
-let lastCharSearch = null;
-let visualAnchor = null;
-let visualCursor = null;
-let editorDoc = null;
-let currentRep = null;
-let desiredColumn = null;
-let lastCommand = null;
-let searchMode = false;
-let searchBuffer = "";
-let searchDirection = null;
-let lastSearch = null;
+let vimEnabled =
+  typeof localStorage !== "undefined" &&
+  localStorage.getItem("ep_vimEnabled") === "true";
+
+const state = {
+  mode: "normal",
+  pendingKey: null,
+  pendingCount: null,
+  countBuffer: "",
+  register: null,
+  marks: {},
+  lastCharSearch: null,
+  visualAnchor: null,
+  visualCursor: null,
+  editorDoc: null,
+  currentRep: null,
+  desiredColumn: null,
+  lastCommand: null,
+  searchMode: false,
+  searchBuffer: "",
+  searchDirection: null,
+  lastSearch: null,
+};
 
 // --- Editor operations ---
 
 const setRegister = (value) => {
-  register = value;
+  state.register = value;
   const text = Array.isArray(value) ? value.join("\n") + "\n" : value;
   if (navigator.clipboard) {
     navigator.clipboard.writeText(text).catch(() => {});
@@ -80,33 +82,37 @@ const selectRange = (editorInfo, start, end) => {
 };
 
 const updateVisualSelection = (editorInfo, rep) => {
-  const vMode = mode === "visual-line" ? "line" : "char";
+  const vMode = state.mode === "visual-line" ? "line" : "char";
   const [start, end] = getVisualSelection(
     vMode,
-    visualAnchor,
-    visualCursor,
+    state.visualAnchor,
+    state.visualCursor,
     rep,
   );
-  selectRange(editorInfo, start, end);
+  if (vMode === "char") {
+    selectRange(editorInfo, start, [end[0], end[1] + 1]);
+  } else {
+    selectRange(editorInfo, start, end);
+  }
 };
 
 const clearEmptyLineCursor = () => {
-  if (!editorDoc) return;
-  const old = editorDoc.querySelector(".vim-empty-line-cursor");
+  if (!state.editorDoc) return;
+  const old = state.editorDoc.querySelector(".vim-empty-line-cursor");
   if (old) old.classList.remove("vim-empty-line-cursor");
 };
 
 const scrollLineIntoView = (line) => {
-  if (!editorDoc) return;
-  const lineDiv = editorDoc.body.querySelectorAll("div")[line];
+  if (!state.editorDoc) return;
+  const lineDiv = state.editorDoc.body.querySelectorAll("div")[line];
   if (lineDiv) lineDiv.scrollIntoView({ block: "nearest" });
 };
 
 const moveBlockCursor = (editorInfo, line, char) => {
   clearEmptyLineCursor();
-  const lineText = currentRep ? getLineText(currentRep, line) : "";
-  if (lineText.length === 0 && editorDoc) {
-    const lineDiv = editorDoc.body.querySelectorAll("div")[line];
+  const lineText = state.currentRep ? getLineText(state.currentRep, line) : "";
+  if (lineText.length === 0 && state.editorDoc) {
+    const lineDiv = state.editorDoc.body.querySelectorAll("div")[line];
     if (lineDiv) lineDiv.classList.add("vim-empty-line-cursor");
     selectRange(editorInfo, [line, 0], [line, 0]);
   } else {
@@ -116,7 +122,7 @@ const moveBlockCursor = (editorInfo, line, char) => {
 };
 
 const moveVisualCursor = (editorInfo, rep, line, char) => {
-  visualCursor = [line, char];
+  state.visualCursor = [line, char];
   updateVisualSelection(editorInfo, rep);
   scrollLineIntoView(line);
 };
@@ -158,12 +164,13 @@ const applyLineOperator = (op, topLine, bottomLine, ctx) => {
     return;
   }
   if (op === "c") {
-    for (let i = topLine; i <= bottomLine; i++) {
-      const text = getLineText(rep, i);
-      replaceRange(editorInfo, [topLine, 0], [topLine, text.length], "");
+    if (bottomLine > topLine) {
+      deleteLines(editorInfo, rep, topLine + 1, bottomLine);
     }
+    const text = getLineText(rep, topLine);
+    replaceRange(editorInfo, [topLine, 0], [topLine, text.length], "");
     moveCursor(editorInfo, topLine, 0);
-    mode = "insert";
+    state.mode = "insert";
     return;
   }
   const cursorLine = deleteLines(editorInfo, rep, topLine, bottomLine);
@@ -186,7 +193,7 @@ const applyOperator = (op, start, end, ctx) => {
   replaceRange(editorInfo, s, e, "");
   if (op === "c") {
     moveCursor(editorInfo, s[0], s[1]);
-    mode = "insert";
+    state.mode = "insert";
   } else {
     moveBlockCursor(editorInfo, s[0], s[1]);
   }
@@ -229,28 +236,36 @@ const resolveTextObject = (key, type, line, lineText, char, rep) => {
 };
 
 const recordCommand = (key, count, param = null) => {
-  lastCommand = { key, count, param };
+  state.lastCommand = { key, count, param };
 };
 
-const registerMotion = (key, getEndPos, inclusive = false) => {
+const registerMotion = (
+  key,
+  getEndPos,
+  inclusive = false,
+  keepDesiredColumn = false,
+) => {
   commands.normal[key] = (ctx) => {
-    desiredColumn = null;
+    if (!keepDesiredColumn) state.desiredColumn = null;
     const pos = getEndPos(ctx);
-    if (pos) moveBlockCursor(ctx.editorInfo, pos.line, pos.char);
+    if (pos) {
+      const lineText = getLineText(ctx.rep, pos.line);
+      moveBlockCursor(ctx.editorInfo, pos.line, clampChar(pos.char, lineText));
+    }
   };
   commands["visual-char"][key] = (ctx) => {
-    desiredColumn = null;
+    if (!keepDesiredColumn) state.desiredColumn = null;
     const pos = getEndPos(ctx);
     if (pos) moveVisualCursor(ctx.editorInfo, ctx.rep, pos.line, pos.char);
   };
   commands["visual-line"][key] = (ctx) => {
-    desiredColumn = null;
+    if (!keepDesiredColumn) state.desiredColumn = null;
     const pos = getEndPos(ctx);
     if (pos) moveVisualCursor(ctx.editorInfo, ctx.rep, pos.line, pos.char);
   };
   for (const op of OPERATORS) {
     commands.normal[op + key] = (ctx) => {
-      desiredColumn = null;
+      state.desiredColumn = null;
       const pos = getEndPos(ctx);
       if (pos) {
         const endChar = inclusive ? pos.char + 1 : pos.char;
@@ -265,19 +280,19 @@ const parameterized = {};
 
 const registerParamMotion = (key, getEndChar) => {
   commands.normal[key] = () => {
-    pendingKey = key;
+    state.pendingKey = key;
   };
   commands["visual-char"][key] = () => {
-    pendingKey = key;
+    state.pendingKey = key;
   };
   commands["visual-line"][key] = () => {
-    pendingKey = key;
+    state.pendingKey = key;
   };
   parameterized[key] = (argKey, ctx) => {
-    lastCharSearch = { direction: key, target: argKey };
+    state.lastCharSearch = { direction: key, target: argKey };
     const pos = getEndChar(argKey, ctx);
     if (pos !== null) {
-      if (mode.startsWith("visual")) {
+      if (state.mode.startsWith("visual")) {
         moveVisualCursor(ctx.editorInfo, ctx.rep, ctx.line, pos);
       } else {
         moveBlockCursor(ctx.editorInfo, ctx.line, pos);
@@ -288,10 +303,10 @@ const registerParamMotion = (key, getEndChar) => {
   for (const op of OPERATORS) {
     const combo = op + key;
     commands.normal[combo] = () => {
-      pendingKey = combo;
+      state.pendingKey = combo;
     };
     parameterized[combo] = (argKey, ctx) => {
-      lastCharSearch = { direction: key, target: argKey };
+      state.lastCharSearch = { direction: key, target: argKey };
       const pos = getEndChar(argKey, ctx);
       if (pos !== null) {
         const range = charMotionRange(key, ctx.char, pos);
@@ -321,10 +336,13 @@ const registerTextObject = (obj, getRange) => {
 
 const getVisibleLineRange = (rep) => {
   const totalLines = rep.lines.length();
-  if (!editorDoc) return { top: 0, bottom: totalLines - 1 };
-  const lineDivs = editorDoc.body.querySelectorAll("div");
+  if (!state.editorDoc) {
+    const mid = Math.floor((totalLines - 1) / 2);
+    return { top: 0, mid, bottom: totalLines - 1 };
+  }
+  const lineDivs = state.editorDoc.body.querySelectorAll("div");
   const lineCount = Math.min(lineDivs.length, totalLines);
-  const frameEl = editorDoc.defaultView.frameElement;
+  const frameEl = state.editorDoc.defaultView.frameElement;
   const iframeTop = frameEl ? frameEl.getBoundingClientRect().top : 0;
   const outerViewportHeight = window.parent ? window.parent.innerHeight : 600;
   let top = 0;
@@ -369,24 +387,40 @@ registerMotion("l", (ctx) => ({
   char: clampChar(ctx.char + ctx.count, ctx.lineText),
 }));
 
-registerMotion("j", (ctx) => {
-  if (desiredColumn === null) desiredColumn = ctx.char;
-  const newLine = clampLine(ctx.line + ctx.count, ctx.rep);
-  const newLineText = getLineText(ctx.rep, newLine);
-  return { line: newLine, char: clampChar(desiredColumn, newLineText) };
-});
+registerMotion(
+  "j",
+  (ctx) => {
+    if (state.desiredColumn === null) state.desiredColumn = ctx.char;
+    const newLine = clampLine(ctx.line + ctx.count, ctx.rep);
+    const newLineText = getLineText(ctx.rep, newLine);
+    return {
+      line: newLine,
+      char: clampChar(state.desiredColumn, newLineText),
+    };
+  },
+  false,
+  true,
+);
 
-registerMotion("k", (ctx) => {
-  if (desiredColumn === null) desiredColumn = ctx.char;
-  const newLine = clampLine(ctx.line - ctx.count, ctx.rep);
-  const newLineText = getLineText(ctx.rep, newLine);
-  return { line: newLine, char: clampChar(desiredColumn, newLineText) };
-});
+registerMotion(
+  "k",
+  (ctx) => {
+    if (state.desiredColumn === null) state.desiredColumn = ctx.char;
+    const newLine = clampLine(ctx.line - ctx.count, ctx.rep);
+    const newLineText = getLineText(ctx.rep, newLine);
+    return {
+      line: newLine,
+      char: clampChar(state.desiredColumn, newLineText),
+    };
+  },
+  false,
+  true,
+);
 
 registerMotion("w", (ctx) => {
   let pos = ctx.char;
   for (let i = 0; i < ctx.count; i++) pos = wordForward(ctx.lineText, pos);
-  return { line: ctx.line, char: clampChar(pos, ctx.lineText) };
+  return { line: ctx.line, char: pos };
 });
 
 registerMotion("b", (ctx) => {
@@ -498,108 +532,65 @@ registerParamMotion("T", (key, ctx) => {
   return pos !== -1 ? pos : null;
 });
 
-commands.normal[";"] = (ctx) => {
-  if (!lastCharSearch) return;
-  const pos = charSearchPos(
-    lastCharSearch.direction,
-    ctx.lineText,
-    ctx.char,
-    lastCharSearch.target,
-    ctx.count,
-  );
-  if (pos !== -1) moveBlockCursor(ctx.editorInfo, ctx.line, pos);
-};
-
-commands.normal[","] = (ctx) => {
-  if (!lastCharSearch) return;
-  const opposite = { f: "F", F: "f", t: "T", T: "t" };
-  const dir = opposite[lastCharSearch.direction];
-  const pos = charSearchPos(
-    dir,
-    ctx.lineText,
-    ctx.char,
-    lastCharSearch.target,
-    ctx.count,
-  );
-  if (pos !== -1) moveBlockCursor(ctx.editorInfo, ctx.line, pos);
+const registerCharRepeat = (key, getDirection) => {
+  const handler = (ctx) => {
+    if (!state.lastCharSearch) return;
+    const dir = getDirection(state.lastCharSearch.direction);
+    const pos = charSearchPos(
+      dir,
+      ctx.lineText,
+      ctx.char,
+      state.lastCharSearch.target,
+      ctx.count,
+    );
+    if (pos === -1) return;
+    if (state.mode.startsWith("visual")) {
+      moveVisualCursor(ctx.editorInfo, ctx.rep, ctx.line, pos);
+    } else {
+      moveBlockCursor(ctx.editorInfo, ctx.line, pos);
+    }
+  };
+  commands.normal[key] = handler;
+  commands["visual-char"][key] = handler;
+  commands["visual-line"][key] = handler;
 };
 
-commands["visual-char"][";"] = (ctx) => {
-  if (!lastCharSearch) return;
-  const pos = charSearchPos(
-    lastCharSearch.direction,
-    ctx.lineText,
-    ctx.char,
-    lastCharSearch.target,
-    ctx.count,
-  );
-  if (pos !== -1) moveVisualCursor(ctx.editorInfo, ctx.rep, ctx.line, pos);
-};
-
-commands["visual-char"][","] = (ctx) => {
-  if (!lastCharSearch) return;
-  const opposite = { f: "F", F: "f", t: "T", T: "t" };
-  const dir = opposite[lastCharSearch.direction];
-  const pos = charSearchPos(
-    dir,
-    ctx.lineText,
-    ctx.char,
-    lastCharSearch.target,
-    ctx.count,
-  );
-  if (pos !== -1) moveVisualCursor(ctx.editorInfo, ctx.rep, ctx.line, pos);
+const sameDirection = (dir) => dir;
+const oppositeDirection = {
+  f: "F",
+  F: "f",
+  t: "T",
+  T: "t",
 };
+const reverseDirection = (dir) => oppositeDirection[dir];
 
-commands["visual-line"][";"] = (ctx) => {
-  if (!lastCharSearch) return;
-  const pos = charSearchPos(
-    lastCharSearch.direction,
-    ctx.lineText,
-    ctx.char,
-    lastCharSearch.target,
-    ctx.count,
-  );
-  if (pos !== -1) moveVisualCursor(ctx.editorInfo, ctx.rep, ctx.line, pos);
-};
-
-commands["visual-line"][","] = (ctx) => {
-  if (!lastCharSearch) return;
-  const opposite = { f: "F", F: "f", t: "T", T: "t" };
-  const dir = opposite[lastCharSearch.direction];
-  const pos = charSearchPos(
-    dir,
-    ctx.lineText,
-    ctx.char,
-    lastCharSearch.target,
-    ctx.count,
-  );
-  if (pos !== -1) moveVisualCursor(ctx.editorInfo, ctx.rep, ctx.line, pos);
-};
+registerCharRepeat(";", sameDirection);
+registerCharRepeat(",", reverseDirection);
 
 // --- Marks ---
 
 commands.normal["m"] = () => {
-  pendingKey = "m";
+  state.pendingKey = "m";
 };
 parameterized["m"] = (key, ctx) => {
-  if (key >= "a" && key <= "z") marks[key] = [ctx.line, ctx.char];
+  if (key >= "a" && key <= "z") state.marks[key] = [ctx.line, ctx.char];
 };
 
 commands.normal["'"] = () => {
-  pendingKey = "'";
+  state.pendingKey = "'";
 };
 commands["visual-char"]["'"] = () => {
-  pendingKey = "'";
+  state.pendingKey = "'";
 };
 commands["visual-line"]["'"] = () => {
-  pendingKey = "'";
+  state.pendingKey = "'";
 };
 parameterized["'"] = (key, ctx) => {
-  if (!marks[key]) return;
-  const [markLine] = marks[key];
+  if (!state.marks[key]) return;
+  const [markLine] = state.marks[key];
   const targetText = getLineText(ctx.rep, markLine);
   const targetChar = firstNonBlank(targetText);
-  if (mode.startsWith("visual")) {
+  if (state.mode.startsWith("visual")) {
     moveVisualCursor(ctx.editorInfo, ctx.rep, markLine, targetChar);
   } else {
     moveBlockCursor(ctx.editorInfo, markLine, targetChar);
@@ -607,18 +598,18 @@ parameterized["'"] = (key, ctx) => {
 };
 
 commands.normal["`"] = () => {
-  pendingKey = "`";
+  state.pendingKey = "`";
 };
 commands["visual-char"]["`"] = () => {
-  pendingKey = "`";
+  state.pendingKey = "`";
 };
 commands["visual-line"]["`"] = () => {
-  pendingKey = "`";
+  state.pendingKey = "`";
 };
 parameterized["`"] = (key, ctx) => {
-  if (!marks[key]) return;
-  const [markLine, markChar] = marks[key];
-  if (mode.startsWith("visual")) {
+  if (!state.marks[key]) return;
+  const [markLine, markChar] = state.marks[key];
+  if (state.mode.startsWith("visual")) {
     moveVisualCursor(ctx.editorInfo, ctx.rep, markLine, markChar);
   } else {
     moveBlockCursor(ctx.editorInfo, markLine, markChar);
@@ -677,24 +668,24 @@ for (const op of OPERATORS) {
 // --- Visual modes ---
 
 commands.normal["v"] = ({ editorInfo, rep, line, char }) => {
-  visualAnchor = [line, char];
-  visualCursor = [line, char];
-  mode = "visual-char";
+  state.visualAnchor = [line, char];
+  state.visualCursor = [line, char];
+  state.mode = "visual-char";
   updateVisualSelection(editorInfo, rep);
 };
 
 commands.normal["V"] = ({ editorInfo, rep, line }) => {
-  visualAnchor = [line, 0];
-  visualCursor = [line, 0];
-  mode = "visual-line";
+  state.visualAnchor = [line, 0];
+  state.visualCursor = [line, 0];
+  state.mode = "visual-line";
   updateVisualSelection(editorInfo, rep);
 };
 
 for (const op of OPERATORS) {
   commands["visual-line"][op] = (ctx) => {
-    const topLine = Math.min(visualAnchor[0], visualCursor[0]);
-    const bottomLine = Math.max(visualAnchor[0], visualCursor[0]);
-    mode = "normal";
+    const topLine = Math.min(state.visualAnchor[0], state.visualCursor[0]);
+    const bottomLine = Math.max(state.visualAnchor[0], state.visualCursor[0]);
+    state.mode = "normal";
     applyLineOperator(op, topLine, bottomLine, ctx);
   };
 }
@@ -703,38 +694,39 @@ for (const op of OPERATORS) {
   commands["visual-char"][op] = (ctx) => {
     const [start, end] = getVisualSelection(
       "char",
-      visualAnchor,
-      visualCursor,
+      state.visualAnchor,
+      state.visualCursor,
       ctx.rep,
     );
-    mode = "normal";
-    applyOperator(op, start, end, ctx);
+    state.mode = "normal";
+    applyOperator(op, start, [end[0], end[1] + 1], ctx);
   };
 }
 
 commands["visual-char"]["~"] = (ctx) => {
   const [start, end] = getVisualSelection(
     "char",
-    visualAnchor,
-    visualCursor,
+    state.visualAnchor,
+    state.visualCursor,
     ctx.rep,
   );
-  const text = getTextInRange(ctx.rep, start, end);
+  const adjustedEnd = [end[0], end[1] + 1];
+  const text = getTextInRange(ctx.rep, start, adjustedEnd);
   let toggled = "";
   for (let i = 0; i < text.length; i++) {
     const ch = text[i];
     toggled += ch === ch.toLowerCase() ? ch.toUpperCase() : ch.toLowerCase();
   }
-  replaceRange(ctx.editorInfo, start, end, toggled);
-  mode = "normal";
+  replaceRange(ctx.editorInfo, start, adjustedEnd, toggled);
+  state.mode = "normal";
   moveBlockCursor(ctx.editorInfo, start[0], start[1]);
 };
 
 commands["visual-line"]["~"] = (ctx) => {
   const [start, end] = getVisualSelection(
     "line",
-    visualAnchor,
-    visualCursor,
+    state.visualAnchor,
+    state.visualCursor,
     ctx.rep,
   );
   const text = getTextInRange(ctx.rep, start, end);
@@ -744,7 +736,7 @@ commands["visual-line"]["~"] = (ctx) => {
     toggled += ch === ch.toLowerCase() ? ch.toUpperCase() : ch.toLowerCase();
   }
   replaceRange(ctx.editorInfo, start, end, toggled);
-  mode = "normal";
+  state.mode = "normal";
   moveBlockCursor(ctx.editorInfo, start[0], start[1]);
 };
 
@@ -755,13 +747,13 @@ commands.normal["u"] = ({ editorInfo }) => {
 };
 
 commands.normal["."] = (ctx) => {
-  if (!lastCommand) return;
-  const { key, count, param } = lastCommand;
+  if (!state.lastCommand) return;
+  const { key, count, param } = state.lastCommand;
   if (param !== null && parameterized[key]) {
     parameterized[key](param, ctx);
-  } else if (commands[mode] && commands[mode][key]) {
+  } else if (commands[state.mode] && commands[state.mode][key]) {
     const newCtx = { ...ctx, count };
-    commands[mode][key](newCtx);
+    commands[state.mode][key](newCtx);
   }
 };
 
@@ -770,41 +762,41 @@ commands.normal["."] = (ctx) => {
 commands.normal["i"] = ({ editorInfo, line, char }) => {
   clearEmptyLineCursor();
   moveCursor(editorInfo, line, char);
-  mode = "insert";
+  state.mode = "insert";
 };
 
 commands.normal["a"] = ({ editorInfo, line, char, lineText }) => {
   clearEmptyLineCursor();
   moveCursor(editorInfo, line, Math.min(char + 1, lineText.length));
-  mode = "insert";
+  state.mode = "insert";
 };
 
 commands.normal["A"] = ({ editorInfo, line, lineText }) => {
   clearEmptyLineCursor();
   moveCursor(editorInfo, line, lineText.length);
-  mode = "insert";
+  state.mode = "insert";
 };
 
 commands.normal["I"] = ({ editorInfo, line, lineText }) => {
   clearEmptyLineCursor();
   moveCursor(editorInfo, line, firstNonBlank(lineText));
-  mode = "insert";
+  state.mode = "insert";
 };
 
 commands["visual-char"]["i"] = () => {
-  pendingKey = "i";
+  state.pendingKey = "i";
 };
 
 commands["visual-char"]["a"] = () => {
-  pendingKey = "a";
+  state.pendingKey = "a";
 };
 
 commands["visual-line"]["i"] = () => {
-  pendingKey = "i";
+  state.pendingKey = "i";
 };
 
 commands["visual-line"]["a"] = () => {
-  pendingKey = "a";
+  state.pendingKey = "a";
 };
 
 commands.normal["o"] = ({ editorInfo, line, lineText }) => {
@@ -816,20 +808,20 @@ commands.normal["o"] = ({ editorInfo, line, lineText }) => {
     "\n",
   );
   moveCursor(editorInfo, line + 1, 0);
-  mode = "insert";
+  state.mode = "insert";
 };
 
 commands.normal["O"] = ({ editorInfo, line }) => {
   clearEmptyLineCursor();
   replaceRange(editorInfo, [line, 0], [line, 0], "\n");
   moveCursor(editorInfo, line, 0);
-  mode = "insert";
+  state.mode = "insert";
 };
 
 // --- More normal mode commands ---
 
 commands.normal["r"] = () => {
-  pendingKey = "r";
+  state.pendingKey = "r";
 };
 parameterized["r"] = (key, { editorInfo, line, char, lineText, count }) => {
   if (lineText.length > 0) {
@@ -855,14 +847,14 @@ commands.normal["x"] = ({ editorInfo, rep, line, char, lineText, count }) => {
 };
 
 commands.normal["p"] = ({ editorInfo, line, char, lineText, count }) => {
-  if (register !== null) {
-    if (typeof register === "string") {
+  if (state.register !== null) {
+    if (typeof state.register === "string") {
       const insertPos = Math.min(char + 1, lineText.length);
-      const repeated = register.repeat(count);
+      const repeated = state.register.repeat(count);
       replaceRange(editorInfo, [line, insertPos], [line, insertPos], repeated);
       moveBlockCursor(editorInfo, line, insertPos);
     } else {
-      const block = register.join("\n");
+      const block = state.register.join("\n");
       const parts = [];
       for (let i = 0; i < count; i++) parts.push(block);
       const insertText = "\n" + parts.join("\n");
@@ -879,13 +871,13 @@ commands.normal["p"] = ({ editorInfo, line, char, lineText, count }) => {
 };
 
 commands.normal["P"] = ({ editorInfo, line, char, count }) => {
-  if (register !== null) {
-    if (typeof register === "string") {
-      const repeated = register.repeat(count);
+  if (state.register !== null) {
+    if (typeof state.register === "string") {
+      const repeated = state.register.repeat(count);
       replaceRange(editorInfo, [line, char], [line, char], repeated);
       moveBlockCursor(editorInfo, line, char);
     } else {
-      const block = register.join("\n");
+      const block = state.register.join("\n");
       const parts = [];
       for (let i = 0; i < count; i++) parts.push(block);
       const insertText = parts.join("\n") + "\n";
@@ -946,7 +938,7 @@ commands.normal["C"] = ({ editorInfo, line, char, lineText }) => {
   setRegister(lineText.slice(char));
   replaceRange(editorInfo, [line, char], [line, lineText.length], "");
   moveCursor(editorInfo, line, char);
-  mode = "insert";
+  state.mode = "insert";
   recordCommand("C", 1);
 };
 
@@ -960,7 +952,7 @@ commands.normal["s"] = ({ editorInfo, rep, line, char, lineText, count }) => {
     "",
   );
   moveCursor(editorInfo, line, char);
-  mode = "insert";
+  state.mode = "insert";
   recordCommand("s", count);
 };
 
@@ -969,35 +961,35 @@ commands.normal["S"] = ({ editorInfo, line, lineText }) => {
   setRegister(lineText);
   replaceRange(editorInfo, [line, 0], [line, lineText.length], "");
   moveCursor(editorInfo, line, 0);
-  mode = "insert";
+  state.mode = "insert";
   recordCommand("S", 1);
 };
 
 // --- Search ---
 
 commands.normal["/"] = () => {
-  searchMode = true;
-  searchBuffer = "";
-  searchDirection = "/";
+  state.searchMode = true;
+  state.searchBuffer = "";
+  state.searchDirection = "/";
 };
 
 commands.normal["?"] = () => {
-  searchMode = true;
-  searchBuffer = "";
-  searchDirection = "?";
+  state.searchMode = true;
+  state.searchBuffer = "";
+  state.searchDirection = "?";
 };
 
 commands.normal["n"] = (ctx) => {
-  if (!lastSearch) return;
-  const { pattern, direction } = lastSearch;
+  if (!state.lastSearch) return;
+  const { pattern, direction } = state.lastSearch;
   const searchFunc = direction === "/" ? searchForward : searchBackward;
   const pos = searchFunc(ctx.rep, ctx.line, ctx.char + 1, pattern, ctx.count);
   if (pos) moveBlockCursor(ctx.editorInfo, pos[0], pos[1]);
 };
 
 commands.normal["N"] = (ctx) => {
-  if (!lastSearch) return;
-  const { pattern, direction } = lastSearch;
+  if (!state.lastSearch) return;
+  const { pattern, direction } = state.lastSearch;
   const searchFunc = direction === "/" ? searchBackward : searchForward;
   const pos = searchFunc(ctx.rep, ctx.line, ctx.char, pattern, ctx.count);
   if (pos) moveBlockCursor(ctx.editorInfo, pos[0], pos[1]);
@@ -1007,36 +999,36 @@ commands.normal["N"] = (ctx) => {
 
 const handleKey = (key, ctx) => {
   if (key >= "1" && key <= "9") {
-    countBuffer += key;
+    state.countBuffer += key;
     return true;
   }
-  if (key === "0" && countBuffer !== "") {
-    countBuffer += key;
+  if (key === "0" && state.countBuffer !== "") {
+    state.countBuffer += key;
     return true;
   }
 
-  if (countBuffer !== "") {
-    pendingCount = parseInt(countBuffer, 10);
-    countBuffer = "";
+  if (state.countBuffer !== "") {
+    state.pendingCount = parseInt(state.countBuffer, 10);
+    state.countBuffer = "";
   }
-  ctx.count = pendingCount !== null ? pendingCount : 1;
-  ctx.hasCount = pendingCount !== null;
+  ctx.count = state.pendingCount !== null ? state.pendingCount : 1;
+  ctx.hasCount = state.pendingCount !== null;
 
-  if (pendingKey !== null && parameterized[pendingKey]) {
-    const handler = parameterized[pendingKey];
-    pendingKey = null;
+  if (state.pendingKey !== null && parameterized[state.pendingKey]) {
+    const handler = parameterized[state.pendingKey];
+    state.pendingKey = null;
     handler(key, ctx);
-    pendingCount = null;
+    state.pendingCount = null;
     return true;
   }
 
-  const map = commands[mode];
-  const seq = pendingKey !== null ? pendingKey + key : key;
+  const map = commands[state.mode];
+  const seq = state.pendingKey !== null ? state.pendingKey + key : key;
 
   if (map[seq]) {
-    pendingKey = null;
+    state.pendingKey = null;
     map[seq](ctx);
-    if (pendingKey === null) pendingCount = null;
+    if (state.pendingKey === null) state.pendingCount = null;
     return true;
   }
 
@@ -1044,25 +1036,25 @@ const handleKey = (key, ctx) => {
     (k) => k.startsWith(seq) && k.length > seq.length,
   );
   if (isPrefix) {
-    pendingKey = seq;
+    state.pendingKey = seq;
     return true;
   }
 
   if (
-    pendingKey &&
+    state.pendingKey &&
     (key === "i" || key === "a") &&
-    Object.keys(map).some((k) => k.startsWith(pendingKey + key))
+    Object.keys(map).some((k) => k.startsWith(state.pendingKey + key))
   ) {
-    pendingKey = pendingKey + key;
+    state.pendingKey = state.pendingKey + key;
     return true;
   }
 
   if (
-    (mode === "visual-char" || mode === "visual-line") &&
-    (pendingKey === "i" || pendingKey === "a")
+    (state.mode === "visual-char" || state.mode === "visual-line") &&
+    (state.pendingKey === "i" || state.pendingKey === "a")
   ) {
-    const type = pendingKey;
-    pendingKey = null;
+    const type = state.pendingKey;
+    state.pendingKey = null;
     const range = resolveTextObject(
       key,
       type,
@@ -1072,15 +1064,15 @@ const handleKey = (key, ctx) => {
       ctx.rep,
     );
     if (range) {
-      visualAnchor = [range.startLine, range.startChar];
-      visualCursor = [range.endLine, range.endChar];
+      state.visualAnchor = [range.startLine, range.startChar];
+      state.visualCursor = [range.endLine, range.endChar];
       updateVisualSelection(ctx.editorInfo, ctx.rep);
     }
     return true;
   }
 
-  pendingKey = null;
-  pendingCount = null;
+  state.pendingKey = null;
+  state.pendingCount = null;
   return true;
 };
 
@@ -1104,7 +1096,7 @@ exports.postAceInit = (_hookName, { ace }) => {
   ace.callWithAce((aceTop) => {
     const rep = aceTop.ace_getRep();
     if (rep && rep.selStart) {
-      currentRep = rep;
+      state.currentRep = rep;
       selectRange(aceTop, rep.selStart, [rep.selStart[0], rep.selStart[1] + 1]);
     }
   });
@@ -1119,57 +1111,57 @@ exports.aceKeyEvent = (_hookName, { evt, rep, editorInfo }) => {
     (evt.key === "x" || evt.key === "c" || evt.key === "v" || evt.key === "r");
   if (isBrowserShortcut) return false;
 
-  currentRep = rep;
-  if (!editorDoc) editorDoc = evt.target.ownerDocument;
+  state.currentRep = rep;
+  if (!state.editorDoc) state.editorDoc = evt.target.ownerDocument;
 
   if (evt.key === "Escape") {
-    desiredColumn = null;
-    if (mode === "visual-line") {
-      const line = Math.min(visualAnchor[0], visualCursor[0]);
-      mode = "normal";
+    state.desiredColumn = null;
+    if (state.mode === "visual-line") {
+      const line = Math.min(state.visualAnchor[0], state.visualCursor[0]);
+      state.mode = "normal";
       moveBlockCursor(editorInfo, line, 0);
-    } else if (mode === "visual-char") {
-      const [vLine, vChar] = visualCursor;
-      mode = "normal";
+    } else if (state.mode === "visual-char") {
+      const [vLine, vChar] = state.visualCursor;
+      state.mode = "normal";
       moveBlockCursor(editorInfo, vLine, vChar);
-    } else if (mode === "insert") {
-      mode = "normal";
+    } else if (state.mode === "insert") {
+      state.mode = "normal";
       const [curLine, curChar] = rep.selStart;
       moveBlockCursor(editorInfo, curLine, Math.max(0, curChar - 1));
     } else {
-      mode = "normal";
+      state.mode = "normal";
       const [curLine, curChar] = rep.selStart;
       moveBlockCursor(editorInfo, curLine, curChar);
     }
-    pendingKey = null;
-    pendingCount = null;
-    countBuffer = "";
+    state.pendingKey = null;
+    state.pendingCount = null;
+    state.countBuffer = "";
     evt.preventDefault();
     return true;
   }
 
-  if (mode === "insert") return false;
+  if (state.mode === "insert") return false;
 
-  if (searchMode) {
+  if (state.searchMode) {
     if (evt.key === "Enter") {
-      searchMode = false;
-      const pattern = searchBuffer;
-      lastSearch = { pattern, direction: searchDirection };
+      state.searchMode = false;
+      const pattern = state.searchBuffer;
+      state.lastSearch = { pattern, direction: state.searchDirection };
       const [curLine, curChar] = rep.selStart;
       const searchFunc =
-        searchDirection === "/" ? searchForward : searchBackward;
+        state.searchDirection === "/" ? searchForward : searchBackward;
       const pos = searchFunc(rep, curLine, curChar + 1, pattern);
       if (pos) moveBlockCursor(editorInfo, pos[0], pos[1]);
-      searchBuffer = "";
+      state.searchBuffer = "";
       evt.preventDefault();
       return true;
     } else if (evt.key === "Escape") {
-      searchMode = false;
-      searchBuffer = "";
+      state.searchMode = false;
+      state.searchBuffer = "";
       evt.preventDefault();
       return true;
     } else if (evt.key.length === 1 && !evt.ctrlKey && !evt.metaKey) {
-      searchBuffer += evt.key;
+      state.searchBuffer += evt.key;
       evt.preventDefault();
       return true;
     }
@@ -1177,8 +1169,8 @@ exports.aceKeyEvent = (_hookName, { evt, rep, editorInfo }) => {
   }
 
   const [line, char] =
-    mode === "visual-line" || mode === "visual-char"
-      ? visualCursor
+    state.mode === "visual-line" || state.mode === "visual-char"
+      ? state.visualCursor
       : rep.selStart;
   const lineText = rep.lines.atIndex(line).text;
   const ctx = { rep, editorInfo, line, char, lineText };
@@ -1186,3 +1178,9 @@ exports.aceKeyEvent = (_hookName, { evt, rep, editorInfo }) => {
   if (handled) evt.preventDefault();
   return handled;
 };
+
+// Exports for testing
+exports._state = state;
+exports._handleKey = handleKey;
+exports._commands = commands;
+exports._parameterized = parameterized;