jpnadas/finrod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.2.0: vim bindings, Shift-H/L focus nav, hot-model default #3

Merged
jpnadas merged 8 commits from feature/vim-bindings into main 2026-06-09 15:22:41 +00:00
Conversation 0 Commits 8 Files Changed 3 +233 -14
2 changed files with 233 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 73aa54d7bd - Show all commits

13
CHANGELOG.md
View File

@@ -10,13 +10,12 @@ Versioning: [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
### Added
- Vim bindings in the input via CodeMirror 6 + `@replit/codemirror-vim` (loaded from esm.sh, no build step). Supports `i`/`Esc`, `hjkl`, word/line motions, `dd`/`yy`/`p`, undo/redo, `/` search, `:` command line. Auto-disabled on touch devices (detected via `(pointer: coarse)`) where modal editing fights the virtual keyboard.
- `Shift-H` / `Shift-L` cycle focus across the page controls (source → target → model → editor → button) like `Shift-Tab` / `Tab`. Also overridden in vim normal mode (replacing vim's viewport-top/bottom default) so the same shortcut works to leave the editor.
- `y` / `Y` / `yy` and visual-mode `y` in the editor now copy to the system clipboard via vim's `+` register (synchronous `document.execCommand("copy")` under the hood — no permission prompt).
- `p` / `P` in vim normal mode paste from the system clipboard at / before the cursor via the same `+` register. The first paste may show a one-time browser permission chip; granting clipboard-read on the origin makes future calls silent.
- Vim-style modal navigation on the From / To / Model dropdowns:
- Default is native typeahead search (type letters to filter)
- `Esc` enters normal mode; an accent-coloured border indicates this
- In normal mode, `j` / `k` move selectedIndex down / up
- `i` or `/` returns to search mode; blur also resets so the next focus starts in search
- `yy` / `Y` and visual-mode `y` in the editor copy to the system clipboard via custom `navigator.clipboard.writeText()` actions (the library's `+` register is broken on Firefox). Bare `y<motion>` (e.g. `yw`, `y$`) still uses vim's internal register — that path would need a deeper hook into the library's register system.
- `p` / `P` in vim normal mode paste from the system clipboard at / before the cursor via `navigator.clipboard.readText()`. Browsers may show a one-time permission prompt or chip; granting clipboard-read for the origin makes future calls silent. On Firefox, ensure `dom.events.asyncClipboard.readText` is `true` (default in recent versions) or the read will be blocked.
- Vim-style modal navigation on the From / To / Model dropdowns (default NORMAL):
- `j` / `k` move selectedIndex down / up (works whether the dropdown is open or collapsed; uses document-level capture-phase listener so Firefox plays along)
- `/` or `i` enters search mode — letter keys then do native typeahead; accent-coloured border indicates it
- `Esc` returns to normal mode; blur also resets so the next focus starts in normal
- On page load, the model dropdown defaults to whichever model Ollama already has hot — skips the 5-15 s disk-reload pain on the first translation. After load it follows the user's manual selection.
### Changed

145
static/index.html
View File

@@ -179,8 +179,9 @@
font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
}
/* Vim normal-mode indicator on the language/model dropdowns */
select.vim-normal {
/* Vim search-mode indicator on the language/model dropdowns
(default is normal mode — j/k navigate; / or i enters search). */
select.vim-search {
border-color: var(--accent);
box-shadow: 0 0 0 1px var(--accent);
}
@@ -517,71 +518,111 @@
moveFocus(k === "l" ? 1 : -1);
});
// Vim customisations: focus navigation + system-clipboard register routing.
// Vim customisations: focus navigation + system-clipboard yank/paste.
// Override H/L (normally "viewport top/bottom") to exit the editor across
// controls, matching the same Shift-H/L contract the document handler
// uses elsewhere. Route y/Y/yy and p/P through vim's "+" register so they
// sync with the system clipboard — the @replit/codemirror-vim "+" handler
// uses document.execCommand("copy") for yank (no permission prompt) and
// navigator.clipboard.readText() for paste (browser may show a one-time
// permission chip; "Allow" makes it permanent).
// controls, matching the Shift-H/L contract the document handler uses.
// Custom yank/paste via navigator.clipboard — the library's "+" register
// path is unreliable on Firefox, so we own the clipboard I/O ourselves.
// Limitation: bare `y<motion>` (yw, y$, etc.) still goes to vim's internal
// register; only yy / Y / visual `y` reach the system clipboard.
if (!isCoarsePointer) {
Vim.defineAction("finrodFocusPrev", () => moveFocus(-1));
Vim.defineAction("finrodFocusNext", () => moveFocus(1));
Vim.mapCommand("H", "action", "finrodFocusPrev", {}, { context: "normal" });
Vim.mapCommand("L", "action", "finrodFocusNext", {}, { context: "normal" });
// Yank → system clipboard (synchronous, no prompt).
Vim.map("y", '"+y', "normal");
Vim.map("Y", '"+Y', "normal");
Vim.map("yy", '"+yy', "normal");
Vim.map("y", '"+y', "visual");
Vim.defineAction("finrodYankLine", () => {
const line = editor.state.doc.lineAt(editor.state.selection.main.head);
const text = editor.state.doc.sliceString(line.from, line.to);
navigator.clipboard.writeText(text)
.catch(e => console.warn("Clipboard write failed:", e));
});
Vim.defineAction("finrodYankSelection", () => {
const { from, to } = editor.state.selection.main;
if (from === to) return;
const text = editor.state.sliceDoc(from, to);
navigator.clipboard.writeText(text)
.catch(e => console.warn("Clipboard write failed:", e));
});
async function pasteAt(after) {
let text;
try {
text = await navigator.clipboard.readText();
} catch (e) {
console.warn("Clipboard read failed:", e);
return;
}
if (!text) return;
const sel = editor.state.selection.main;
const pos = after ? sel.to : sel.from;
editor.dispatch({
changes: { from: pos, insert: text },
selection: { anchor: pos + text.length },
});
}
Vim.defineAction("finrodPasteAfter", () => pasteAt(true));
Vim.defineAction("finrodPasteBefore", () => pasteAt(false));
// Paste ← system clipboard. The chip nag is browser-side; granting
// clipboard-read permission for the origin makes it silent.
Vim.map("p", '"+p', "normal");
Vim.map("P", '"+P', "normal");
Vim.mapCommand("yy", "action", "finrodYankLine", {}, { context: "normal" });
Vim.mapCommand("Y", "action", "finrodYankLine", {}, { context: "normal" });
Vim.mapCommand("y", "action", "finrodYankSelection", {}, { context: "visual" });
Vim.mapCommand("p", "action", "finrodPasteAfter", {}, { context: "normal" });
Vim.mapCommand("P", "action", "finrodPasteBefore", {}, { context: "normal" });
}
// Modal vim-style behavior on the language/model dropdowns.
// default: typeahead search (browser native)
// Esc: switch to "normal" mode — j/k move selectedIndex
// i, /: back to search mode
// blur: reset to search mode on next focus
// Disabled on touch (no Esc key, no value).
// default: NORMAL mode — j/k move selectedIndex (vim everywhere)
// `/` or `i`: enter search mode — letter keys do native typeahead
// Esc: back to normal mode
// blur: reset to normal mode on next focus
// Uses a document-level CAPTURE listener so events fire whether the
// dropdown is open or collapsed (Firefox doesn't bubble keydown
// reliably from a collapsed <select>).
if (!isCoarsePointer) {
for (const sel of [sourceSel, targetSel, modelSel]) {
sel.dataset.mode = "search";
const enterNormal = () => {
const vimSelects = [sourceSel, targetSel, modelSel];
for (const sel of vimSelects) {
sel.dataset.mode = "normal";
sel.addEventListener("blur", () => {
sel.dataset.mode = "normal";
sel.classList.add("vim-normal");
};
const enterSearch = () => {
sel.dataset.mode = "search";
sel.classList.remove("vim-normal");
};
const step = (delta) => {
const next = sel.selectedIndex + delta;
if (next < 0 || next >= sel.options.length) return;
sel.selectedIndex = next;
sel.dispatchEvent(new Event("change", { bubbles: true }));
};
sel.addEventListener("keydown", (e) => {
if (e.key === "Escape") {
enterNormal();
e.preventDefault();
return;
}
if (sel.dataset.mode === "search") return; // native typeahead
if (e.key === "j") { e.preventDefault(); step(+1); return; }
if (e.key === "k") { e.preventDefault(); step(-1); return; }
if (e.key === "i" || e.key === "/") { enterSearch(); e.preventDefault(); return; }
// Let Shift-H/L bubble to the document focus handler; preventDefault
// anything else so it doesn't pollute the next search.
if (!(e.shiftKey && (e.key === "H" || e.key === "L"))) e.preventDefault();
sel.classList.remove("vim-search");
});
sel.addEventListener("blur", enterSearch);
}
const step = (sel, delta) => {
const next = sel.selectedIndex + delta;
if (next < 0 || next >= sel.options.length) return;
sel.selectedIndex = next;
sel.dispatchEvent(new Event("change", { bubbles: true }));
};
document.addEventListener("keydown", (e) => {
const sel = document.activeElement;
if (!vimSelects.includes(sel)) return;
// Shift-H/L: let the focus-nav handler take it; don't preventDefault.
if (e.shiftKey && (e.key === "H" || e.key === "L")) return;
if (e.key === "Escape") {
sel.dataset.mode = "normal";
sel.classList.remove("vim-search");
e.preventDefault();
e.stopPropagation();
return;
}
if (sel.dataset.mode === "search") return; // let native typeahead happen
// normal mode
if (e.key === "j") { e.preventDefault(); e.stopPropagation(); step(sel, +1); return; }
if (e.key === "k") { e.preventDefault(); e.stopPropagation(); step(sel, -1); return; }
if (e.key === "/" || e.key === "i") {
sel.dataset.mode = "search";
sel.classList.add("vim-search");
e.preventDefault();
e.stopPropagation();
return;
}
// Suppress any other letter so typeahead doesn't fire silently in normal mode.
if (e.key.length === 1) {
e.preventDefault();
e.stopPropagation();
}
}, true); // CAPTURE phase — needed for closed-dropdown keydowns on Firefox
}
fillLangs();