diff --git a/plug-api/syscalls/editor.ts b/plug-api/syscalls/editor.ts index c0561da6..11f5338a 100644 --- a/plug-api/syscalls/editor.ts +++ b/plug-api/syscalls/editor.ts @@ -478,8 +478,8 @@ export function vimEx(exCommand: string): Promise { /** * Execute a vim config using the CodeMirror Vim Mode API */ -export function vimConfig(): Promise { - return syscall("editor.vimConfig"); +export function configureVimMode(): Promise { + return syscall("editor.configureVimMode"); } // Document editor specific syscalls diff --git a/plugs/editor/vim.ts b/plugs/editor/vim.ts index edc20a35..54c1f47f 100644 --- a/plugs/editor/vim.ts +++ b/plugs/editor/vim.ts @@ -42,7 +42,7 @@ export async function loadVimConfig() { try { await editor.save(); await editor.reloadConfigAndCommands(); - await editor.vimConfig(); + await editor.configureVimMode(); } catch (e: any) { await editor.flashNotification(e.message, "error"); } diff --git a/web/editor_state.ts b/web/editor_state.ts index 466cedfc..a788bab7 100644 --- a/web/editor_state.ts +++ b/web/editor_state.ts @@ -307,7 +307,7 @@ export function createCommandKeyBindings(client: Client): KeyBinding[] { // Track which keyboard shortcuts for which commands we've overridden, so we can skip them later const overriddenCommands = new Set(); - // Keyboard shortcuts from SETTINGS take precedense + // Keyboard shortcuts from SETTINGS take precedence if (client.config.has("shortcuts")) { for (const shortcut of client.config.get("shortcuts", [])) { overriddenCommands.add(shortcut.command); diff --git a/web/syscalls/editor.ts b/web/syscalls/editor.ts index e9635804..f87d1b4e 100644 --- a/web/syscalls/editor.ts +++ b/web/syscalls/editor.ts @@ -8,6 +8,7 @@ import { } from "@codemirror/language"; import { deleteLine, + insertNewlineAndIndent, moveLineDown, moveLineUp, redo, @@ -24,6 +25,8 @@ import type { import type { PageMeta, UploadFile } from "../../plug-api/types.ts"; import { openSearchPanel } from "@codemirror/search"; import { parseRef, type Ref } from "@silverbulletmd/silverbullet/lib/page_ref"; +import { insertNewlineContinueMarkup } from "@codemirror/lang-markdown"; +import { configureVimMode } from "../../plug-api/syscalls/editor.ts"; export function editorSyscalls(client: Client): SysCallMapping { const syscalls: SysCallMapping = { @@ -400,7 +403,16 @@ export function editorSyscalls(client: Client): SysCallMapping { throw new Error("Vim mode not active or not initialized."); } }, - "editor.vimConfig": () => { + "editor.configureVimMode": () => { + // Override the default "o" binding to be more intelligent and follow the markdown editor's behavior + Vim.mapCommand("o", "action", "newline-continue-markup", {}, {}); + Vim.defineAction("newline-continue-markup", (cm) => { + Vim.handleKey(cm, "A", "+input"); + insertNewlineContinueMarkup(client.editorView) || + insertNewlineAndIndent(client.editorView); + }); + + // Load the config if any const config = client.config.get("vim", {}); if (config) { config.unmap?.forEach((binding) => {