@fresh-editor/fresh-editor 0.2.25 → 0.3.1

package/plugins/audit_mode.ts

@@ -54,6 +54,7 @@ interface Hunk {
   oldRange: { start: number; end: number };  // old file line range
   type: 'add' | 'remove' | 'modify';
   lines: string[];
+  status?: string;
   contextHeader: string;
   byteOffset: number; // Position in the virtual buffer
   gitStatus?: 'staged' | 'unstaged' | 'untracked';
@@ -1579,7 +1580,7 @@ function on_review_mouse_click(data: {
                 else state.collapsedSections.add(cat);
                 applyFolds();
                 const sectionRow = state.sectionHeaderRows[cat];
-                if (sectionRow !== undefined) jumpDiffCursorToRow(sectionRow);
+                if (sectionRow !== undefined) jumpDiffCursorToRow(sectionRow, { recenter: false });
                 return;
             }
         }
@@ -1591,7 +1592,7 @@ function on_review_mouse_click(data: {
                 else state.collapsedFiles.add(key);
                 applyFolds();
                 const headerRow = state.fileHeaderRows[key];
-                if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+                if (headerRow !== undefined) jumpDiffCursorToRow(headerRow, { recenter: false });
                 return;
             }
         }
@@ -1602,7 +1603,7 @@ function on_review_mouse_click(data: {
                 else state.collapsedHunks.add(hunkId);
                 applyFolds();
                 const hunkRow = state.hunkRowByHunkId[hunkId];
-                if (hunkRow !== undefined) jumpDiffCursorToRow(hunkRow);
+                if (hunkRow !== undefined) jumpDiffCursorToRow(hunkRow, { recenter: false });
                 return;
             }
         }
@@ -1812,7 +1813,7 @@ function review_toggle_file_collapse() {
         else state.collapsedSections.add(section);
         applyFolds();
         const sectionRow = state.sectionHeaderRows[section];
-        if (sectionRow !== undefined) jumpDiffCursorToRow(sectionRow);
+        if (sectionRow !== undefined) jumpDiffCursorToRow(sectionRow, { recenter: false });
         return;
     }
 
@@ -1824,7 +1825,7 @@ function review_toggle_file_collapse() {
         else state.collapsedFiles.add(key);
         applyFolds();
         const headerRow = state.fileHeaderRows[key];
-        if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+        if (headerRow !== undefined) jumpDiffCursorToRow(headerRow, { recenter: false });
         return;
     }
 
@@ -1835,7 +1836,7 @@ function review_toggle_file_collapse() {
         else state.collapsedHunks.add(hunk.id);
         applyFolds();
         const hunkRow = state.hunkRowByHunkId[hunk.id];
-        if (hunkRow !== undefined) jumpDiffCursorToRow(hunkRow);
+        if (hunkRow !== undefined) jumpDiffCursorToRow(hunkRow, { recenter: false });
         return;
     }
 
@@ -1848,7 +1849,7 @@ function review_toggle_file_collapse() {
     else state.collapsedFiles.add(key);
     applyFolds();
     const headerRow = state.fileHeaderRows[key];
-    if (headerRow !== undefined) jumpDiffCursorToRow(headerRow);
+    if (headerRow !== undefined) jumpDiffCursorToRow(headerRow, { recenter: false });
 }
 registerHandler("review_toggle_file_collapse", review_toggle_file_collapse);
 
@@ -2462,48 +2463,9 @@ function review_discard_file() {
 }
 registerHandler("review_discard_file", review_discard_file);
 
-async function on_review_discard_hunk_confirm(args: { prompt_type: string; input: string; selected_index: number | null }): Promise<boolean> {
-    if (args.prompt_type !== "review-discard-hunk-confirm") return true;
-    const response = args.input.trim().toLowerCase();
-    if (response === "discard" || args.selected_index === 0) {
-        const hunk = getHunkAtDiffCursor();
-        if (hunk && hunk.file) {
-            const patch = buildHunkPatch(hunk.file, hunk);
-            const ok = await applyHunkPatch(patch, ["--reverse"]);
-            if (ok) {
-                editor.setStatus(editor.t("status.hunk_discarded") || "Hunk discarded");
-                await refreshMagitData();
-            }
-        }
-    } else {
-        editor.setStatus("Discard cancelled");
-    }
-    return false;
-}
-registerHandler("on_review_discard_hunk_confirm", on_review_discard_hunk_confirm);
 
-async function on_review_discard_confirm(args: { prompt_type: string; input: string; selected_index: number | null }): Promise<boolean> {
-    if (args.prompt_type !== "review-discard-confirm") return true;
 
-    const response = args.input.trim().toLowerCase();
-    if (response === "discard" || args.selected_index === 0) {
-        const f = pendingDiscardFile;
-        if (f) {
-            if (f.category === 'untracked') {
-                await editor.spawnProcess("rm", ["--", f.path]);
-            } else {
-                await editor.spawnProcess("git", ["checkout", "--", f.path]);
-            }
-            await refreshMagitData();
-            editor.setStatus(`Discarded: ${f.path}`);
-        }
-    } else {
-        editor.setStatus("Discard cancelled");
-    }
-    pendingDiscardFile = null;
-    return false;
-}
-registerHandler("on_review_discard_confirm", on_review_discard_confirm);
+
 
 /**
  * Refresh file list and diffs using the new git status approach, then re-render.
@@ -3147,23 +3109,31 @@ registerHandler("review_drill_down", review_drill_down);
 // --- Hunk navigation for side-by-side diff view ---
 
 /**
- * Move the diff panel's native cursor to the given 1-indexed row, scrolling
- * the viewport so the row is visible.
+ * Move the diff panel's native cursor to the given 1-indexed row.
+ *
+ * `options.recenter` controls whether the viewport is re-centered on the
+ * target row. The default is `true` for user-initiated navigation (next
+ * hunk, jump-to-comment, jump-to-file) — there the caller wants the
+ * target to land at a predictable position in the viewport. Callers
+ * that merely re-anchor the cursor to a nearby header (e.g. after a
+ * collapse/expand toggle) should pass `recenter: false` so the viewport
+ * stays put; `setBufferCursor` still runs `ensure_cursor_visible`, so
+ * the cursor is scrolled into view only when it would otherwise move
+ * off-screen. Without this opt-out every fold toggle re-centers the
+ * cursor's row at ~1/3 from the top of the viewport, which makes the
+ * diff jump around whenever the user is reading anywhere else.
  */
-function jumpDiffCursorToRow(row: number): void {
+function jumpDiffCursorToRow(row: number, options?: { recenter?: boolean }): void {
     const diffId = state.panelBuffers["diff"];
     if (diffId === undefined) return;
     const idx = row - 1;
     if (idx < 0 || idx >= state.diffLineByteOffsets.length) return;
 
-    // Set the cursor by absolute byte offset + scroll the viewport.
-    // Trust setBufferCursor — the previous N × executeAction("move_down")
-    // walk was O(target_row) round-trips into the editor and made
-    // collapsing big diffs visibly slow (thousands of round trips just
-    // to land the cursor on a header).
     const byteOffset = state.diffLineByteOffsets[idx];
     editor.setBufferCursor(diffId, byteOffset);
-    editor.scrollBufferToLine(diffId, idx);
+    if (options?.recenter !== false) {
+        editor.scrollBufferToLine(diffId, idx);
+    }
     state.diffCursorRow = row;
     applyCursorLineOverlay('diff');
     refreshStickyHeader(idx);
@@ -3448,28 +3418,15 @@ async function review_delete_comment() {
 }
 registerHandler("review_delete_comment", review_delete_comment);
 
-function on_review_delete_comment_confirm(args: { prompt_type: string; input: string; selected_index: number | null }): boolean {
-    if (args.prompt_type !== "review-delete-comment-confirm") return true;
-    const response = args.input.trim().toLowerCase();
-    if ((response === "delete" || args.selected_index === 0) && pendingDeleteCommentId) {
-        if (pendingDeleteCommentId === '__note__') {
-            state.note = '';
-        } else {
-            state.comments = state.comments.filter(c => c.id !== pendingDeleteCommentId);
-        }
-        persistReview();
-        updateMagitDisplay();
-        editor.setStatus("Deleted");
-    } else {
-        editor.setStatus("Delete cancelled");
-    }
-    pendingDeleteCommentId = null;
-    return false;
-}
-registerHandler("on_review_delete_comment_confirm", on_review_delete_comment_confirm);
+
 
 // Prompt event handlers
-function on_review_prompt_confirm(args: { prompt_type: string; input: string }): boolean {
+
+
+
+
+// Register prompt event handlers
+editor.on("prompt_confirmed", (args) => {
     if (args.prompt_type !== "review-comment") {
         return true;
     }
@@ -3532,38 +3489,47 @@ function on_review_prompt_confirm(args: { prompt_type: string; input: string }):
     }
     pendingCommentInfo = null;
     return true;
-}
-registerHandler("on_review_prompt_confirm", on_review_prompt_confirm);
+});
+editor.on("prompt_confirmed", async (args) => {
+    if (args.prompt_type !== "review-discard-confirm") return true;
 
-function on_review_prompt_cancel(args: { prompt_type: string }): boolean {
-    if (args.prompt_type === "review-comment") {
-        pendingCommentInfo = null;
-        editingCommentId = null;
-        editor.setStatus(editor.t("status.comment_cancelled"));
+    const response = args.input.trim().toLowerCase();
+    if (response === "discard" || args.selected_index === 0) {
+        const f = pendingDiscardFile;
+        if (f) {
+            if (f.category === 'untracked') {
+                await editor.spawnProcess("rm", ["--", f.path]);
+            } else {
+                await editor.spawnProcess("git", ["checkout", "--", f.path]);
+            }
+            await refreshMagitData();
+            editor.setStatus(`Discarded: ${f.path}`);
+        }
+    } else {
+        editor.setStatus("Discard cancelled");
     }
-    return true;
-}
-registerHandler("on_review_prompt_cancel", on_review_prompt_cancel);
-
-// Register prompt event handlers
-editor.on("prompt_confirmed", "on_review_prompt_confirm");
-editor.on("prompt_confirmed", "on_review_discard_confirm");
-editor.on("prompt_confirmed", "on_review_discard_hunk_confirm");
-editor.on("prompt_confirmed", "on_review_edit_note_confirm");
-editor.on("prompt_confirmed", "on_review_delete_comment_confirm");
-editor.on("prompt_cancelled", "on_review_prompt_cancel");
-
-async function review_edit_note() {
-    const label = editor.t("prompt.overall_comment") || "Note: ";
-    if (state.note) {
-        editor.startPromptWithInitial(label, "review-edit-note", state.note);
+    pendingDiscardFile = null;
+    return false;
+});
+editor.on("prompt_confirmed", async (args) => {
+    if (args.prompt_type !== "review-discard-hunk-confirm") return true;
+    const response = args.input.trim().toLowerCase();
+    if (response === "discard" || args.selected_index === 0) {
+        const hunk = getHunkAtDiffCursor();
+        if (hunk && hunk.file) {
+            const patch = buildHunkPatch(hunk.file, hunk);
+            const ok = await applyHunkPatch(patch, ["--reverse"]);
+            if (ok) {
+                editor.setStatus(editor.t("status.hunk_discarded") || "Hunk discarded");
+                await refreshMagitData();
+            }
+        }
     } else {
-        editor.startPrompt(label, "review-edit-note");
+        editor.setStatus("Discard cancelled");
     }
-}
-registerHandler("review_edit_note", review_edit_note);
-
-function on_review_edit_note_confirm(args: { prompt_type: string; input: string }): boolean {
+    return false;
+});
+editor.on("prompt_confirmed", (args) => {
     if (args.prompt_type !== "review-edit-note") return true;
     if (args.input && args.input.trim()) {
         state.note = args.input.trim();
@@ -3577,8 +3543,45 @@ function on_review_edit_note_confirm(args: { prompt_type: string; input: string
         }
     }
     return true;
+});
+editor.on("prompt_confirmed", (args) => {
+    if (args.prompt_type !== "review-delete-comment-confirm") return true;
+    const response = args.input.trim().toLowerCase();
+    if ((response === "delete" || args.selected_index === 0) && pendingDeleteCommentId) {
+        if (pendingDeleteCommentId === '__note__') {
+            state.note = '';
+        } else {
+            state.comments = state.comments.filter(c => c.id !== pendingDeleteCommentId);
+        }
+        persistReview();
+        updateMagitDisplay();
+        editor.setStatus("Deleted");
+    } else {
+        editor.setStatus("Delete cancelled");
+    }
+    pendingDeleteCommentId = null;
+    return false;
+});
+editor.on("prompt_cancelled", (args) => {
+    if (args.prompt_type === "review-comment") {
+        pendingCommentInfo = null;
+        editingCommentId = null;
+        editor.setStatus(editor.t("status.comment_cancelled"));
+    }
+    return true;
+});
+
+async function review_edit_note() {
+    const label = editor.t("prompt.overall_comment") || "Note: ";
+    if (state.note) {
+        editor.startPromptWithInitial(label, "review-edit-note", state.note);
+    } else {
+        editor.startPrompt(label, "review-edit-note");
+    }
 }
-registerHandler("on_review_edit_note_confirm", on_review_edit_note_confirm);
+registerHandler("review_edit_note", review_edit_note);
+
+
 
 async function review_export_session() {
     const cwd = editor.getCwd();
@@ -3728,15 +3731,15 @@ async function openReviewPanels(groupName: string): Promise<boolean> {
 
     updateMagitDisplay();
 
-    editor.focusBufferGroupPanel(state.groupId, "diff");
+    editor.focusBufferGroupPanel(state.groupId!, "diff");
 
-    editor.on("resize", "onReviewDiffResize");
+    editor.on("resize", onReviewDiffResize);
     updateReviewStatus();
-    editor.on("buffer_activated", "on_review_buffer_activated");
-    editor.on("buffer_closed", "on_review_buffer_closed");
-    editor.on("cursor_moved", "on_review_cursor_moved");
-    editor.on("viewport_changed", "on_review_viewport_changed");
-    editor.on("mouse_click", "on_review_mouse_click");
+    editor.on("buffer_activated", on_review_buffer_activated);
+    editor.on("buffer_closed", on_review_buffer_closed);
+    editor.on("cursor_moved", on_review_cursor_moved);
+    editor.on("viewport_changed", on_review_viewport_changed);
+    editor.on("mouse_click", on_review_mouse_click);
     return true;
 }
 
@@ -3812,12 +3815,12 @@ function stop_review_diff() {
     }
     state.reviewBufferId = null;
     editor.setContext("review-mode", false);
-    editor.off("resize", "onReviewDiffResize");
-    editor.off("buffer_activated", "on_review_buffer_activated");
-    editor.off("buffer_closed", "on_review_buffer_closed");
-    editor.off("cursor_moved", "on_review_cursor_moved");
-    editor.off("viewport_changed", "on_review_viewport_changed");
-    editor.off("mouse_click", "on_review_mouse_click");
+    editor.off("resize", onReviewDiffResize);
+    editor.off("buffer_activated", on_review_buffer_activated);
+    editor.off("buffer_closed", on_review_buffer_closed);
+    editor.off("cursor_moved", on_review_cursor_moved);
+    editor.off("viewport_changed", on_review_viewport_changed);
+    editor.off("mouse_click", on_review_mouse_click);
     editor.setStatus(editor.t("status.stopped"));
 }
 registerHandler("stop_review_diff", stop_review_diff);
@@ -3960,7 +3963,8 @@ async function start_review_range(): Promise<void> {
 }
 registerHandler("start_review_range", start_review_range);
 
-function on_review_range_confirm(args: { prompt_type: string; input: string }): boolean {
+
+editor.on("prompt_confirmed", (args) => {
     if (args.prompt_type !== "review-range") return true;
     const range = parseRangeInput(args.input);
     if (!range) {
@@ -3971,9 +3975,7 @@ function on_review_range_confirm(args: { prompt_type: string; input: string }):
     // can return immediately.
     bootstrapRangeReview(range);
     return true;
-}
-registerHandler("on_review_range_confirm", on_review_range_confirm);
-editor.on("prompt_confirmed", "on_review_range_confirm");
+});
 
 async function bootstrapRangeReview(range: ReviewRange): Promise<void> {
     editor.setStatus(editor.t("status.generating") || "Generating diff…");
@@ -4388,12 +4390,47 @@ const branchState: ReviewBranchState = {
     detailBufferId: null,
     commits: [],
     selectedIndex: 0,
-    baseRef: "main",
+    // Empty means "not yet detected"; start_review_branch fills this in
+    // from the repo's actual default branch (main, master, or whatever
+    // origin/HEAD points at) before showing the prompt.
+    baseRef: "",
     detailCache: null,
     pendingDetailId: 0,
     logRowByteOffsets: [],
 };
 
+/**
+ * Best-effort detection of the repo's default branch. Checks, in order:
+ *   1. `origin/HEAD` (the remote's notion of the default branch)
+ *   2. local `main`
+ *   3. local `master`
+ * Falls back to `main` if none match, so the prompt still has a sensible
+ * default in an empty / unusual repo.
+ */
+async function detectDefaultBranch(): Promise<string> {
+    try {
+        const r = await editor.spawnProcess("git", [
+            "symbolic-ref", "--short", "refs/remotes/origin/HEAD",
+        ]);
+        if (r.exit_code === 0) {
+            const name = r.stdout.trim();
+            // Output looks like "origin/main"; strip the remote prefix.
+            const slash = name.indexOf("/");
+            const branch = slash >= 0 ? name.slice(slash + 1) : name;
+            if (branch) return branch;
+        }
+    } catch { /* fall through */ }
+    for (const candidate of ["main", "master"]) {
+        try {
+            const r = await editor.spawnProcess("git", [
+                "show-ref", "--verify", "--quiet", `refs/heads/${candidate}`,
+            ]);
+            if (r.exit_code === 0) return candidate;
+        } catch { /* fall through */ }
+    }
+    return "main";
+}
+
 // UTF-8 byte length helper, local copy so audit_mode doesn't pull in the one
 // from git_history (keeps the import list tiny).
 function branchUtf8Len(s: string): number {
@@ -4501,16 +4538,20 @@ async function start_review_branch(): Promise<void> {
         return;
     }
     // Prompt for the base ref so the user can review any PR, not just
-    // one branched off main.
-    const input = await editor.prompt(
-        editor.t("prompt.branch_base") || "Base ref (default: main):",
-        branchState.baseRef,
-    );
+    // one branched off main. The default offered is either what the user
+    // picked last time in this session, or the repo's actual default
+    // branch (main/master/etc.) on first use.
+    const suggested = branchState.baseRef || await detectDefaultBranch();
+    const rawPromptText = editor.t("prompt.branch_base", { default: suggested });
+    const promptText = (rawPromptText && !rawPromptText.startsWith("prompt."))
+        ? rawPromptText
+        : `Base ref to compare against (default: ${suggested}):`;
+    const input = await editor.prompt(promptText + " ", suggested);
     if (input === null) {
         editor.setStatus(editor.t("status.cancelled") || "Cancelled");
         return;
     }
-    const base = input.trim() || "main";
+    const base = input.trim() || suggested;
     branchState.baseRef = base;
 
     editor.setStatus(editor.t("status.loading") || "Loading commits…");
@@ -4560,7 +4601,7 @@ async function start_review_branch(): Promise<void> {
     if (branchState.groupId !== null) {
         editor.focusBufferGroupPanel(branchState.groupId, "log");
     }
-    editor.on("cursor_moved", "on_review_branch_cursor_moved");
+    editor.on("cursor_moved", on_review_branch_cursor_moved);
 
     editor.setStatus(
         editor.t("status.review_branch_ready", {
@@ -4574,7 +4615,7 @@ registerHandler("start_review_branch", start_review_branch);
 function stop_review_branch(): void {
     if (!branchState.isOpen) return;
     if (branchState.groupId !== null) editor.closeBufferGroup(branchState.groupId);
-    editor.off("cursor_moved", "on_review_branch_cursor_moved");
+    editor.off("cursor_moved", on_review_branch_cursor_moved);
     branchState.isOpen = false;
     branchState.groupId = null;
     branchState.logBufferId = null;
@@ -4637,17 +4678,11 @@ registerHandler("on_review_branch_cursor_moved", on_review_branch_cursor_moved);
 editor.defineMode(
     "review-branch",
     [
-        // Mode bindings replace globals, so we re-bind the editor's built-in
-        // motion actions here explicitly — without this, j/k and Up/Down
-        // do nothing in the commit list.
-        ["Up", "move_up"],
-        ["Down", "move_down"],
+        // vi-style aliases for Up/Down. Everything else (arrows,
+        // Page{Up,Down}, Home/End, selection motion, …) is inherited
+        // from the Normal keymap via `inheritNormalBindings: true`.
         ["k", "move_up"],
         ["j", "move_down"],
-        ["PageUp", "page_up"],
-        ["PageDown", "page_down"],
-        ["Home", "move_line_start"],
-        ["End", "move_line_end"],
         // Enter: focus the right-hand detail panel.
         ["Return", "review_branch_enter"],
         ["Tab", "review_branch_enter"],
@@ -4655,7 +4690,9 @@ editor.defineMode(
         ["q", "review_branch_close_or_back"],
         ["Escape", "review_branch_close_or_back"],
     ],
-    true,
+    true, // readOnly
+    false, // allowTextInput — keeps plain letters from inserting into the RO buffer
+    true, // inheritNormalBindings — PageUp/PageDown/arrows/Home/End come from Normal
 );
 
 // Register Modes and Commands
@@ -4674,7 +4711,9 @@ editor.registerCommand("%cmd.export_markdown", "%cmd.export_markdown_desc", "rev
 editor.registerCommand("%cmd.export_json", "%cmd.export_json_desc", "review_export_json", "review-mode");
 
 // Handler for when buffers are closed - cleans up scroll sync groups and composite buffers
-function on_buffer_closed(data: any) {
+
+
+editor.on("buffer_closed", (data) => {
     // If one of the diff view buffers is closed, clean up the scroll sync group
     if (activeSideBySideState) {
         if (data.buffer_id === activeSideBySideState.oldBufferId ||
@@ -4701,10 +4740,7 @@ function on_buffer_closed(data: any) {
             activeCompositeDiffState = null;
         }
     }
-}
-registerHandler("on_buffer_closed", on_buffer_closed);
-
-editor.on("buffer_closed", "on_buffer_closed");
+});
 
 editor.defineMode("review-mode", [
     // Native cursor motion in the unified diff stream.

package/plugins/bash-lsp.ts

@@ -49,7 +49,10 @@ let bashLspError: { serverCommand: string; message: string } | null = null;
 /**
  * Handle LSP server errors for Bash
  */
-function on_bash_lsp_server_error(data: LspServerErrorData): void {
+
+
+// Register hook for LSP server errors
+editor.on("lsp_server_error", (data) => {
   // Only handle Bash language errors
   if (data.language !== "bash") {
     return;
@@ -71,18 +74,15 @@ function on_bash_lsp_server_error(data: LspServerErrorData): void {
   } else {
     editor.setStatus(`Bash LSP error: ${data.message}`);
   }
-}
-registerHandler("on_bash_lsp_server_error", on_bash_lsp_server_error);
-
-// Register hook for LSP server errors
-editor.on("lsp_server_error", "on_bash_lsp_server_error");
+});
 
 /**
  * Handle status bar click when there's a Bash LSP error
  */
-function on_bash_lsp_status_clicked(
-  data: LspStatusClickedData
-): void {
+
+
+// Register hook for status bar clicks
+editor.on("lsp_status_clicked", (data) => {
   // Only handle Bash language clicks when there's an error
   if (data.language !== "bash" || !bashLspError) {
     return;
@@ -103,18 +103,15 @@ function on_bash_lsp_status_clicked(
       { id: "dismiss", label: "Dismiss (ESC)" },
     ],
   });
-}
-registerHandler("on_bash_lsp_status_clicked", on_bash_lsp_status_clicked);
-
-// Register hook for status bar clicks
-editor.on("lsp_status_clicked", "on_bash_lsp_status_clicked");
+});
 
 /**
  * Handle action popup results for Bash LSP help
  */
-function on_bash_lsp_action_result(
-  data: ActionPopupResultData
-): void {
+
+
+// Register hook for action popup results
+editor.on("action_popup_result", (data) => {
   // Only handle our popup
   if (data.popup_id !== "bash-lsp-help") {
     return;
@@ -152,10 +149,6 @@ function on_bash_lsp_action_result(
     default:
       editor.debug(`bash-lsp: Unknown action: ${data.action_id}`);
   }
-}
-registerHandler("on_bash_lsp_action_result", on_bash_lsp_action_result);
-
-// Register hook for action popup results
-editor.on("action_popup_result", "on_bash_lsp_action_result");
+});
 
 editor.debug("bash-lsp: Plugin loaded");

package/plugins/clangd-lsp.ts

@@ -54,9 +54,10 @@ let clangdLspError: {
 /**
  * Handle LSP server errors for C/C++
  */
-function on_clangd_lsp_server_error(
-  data: LspServerErrorData
-): void {
+
+
+// Register hook for LSP server errors
+editor.on("lsp_server_error", (data) => {
   // Only handle C/C++ language errors
   if (!HANDLED_LANGUAGES.includes(data.language)) {
     return;
@@ -79,18 +80,15 @@ function on_clangd_lsp_server_error(
   } else {
     editor.setStatus(`C/C++ LSP error: ${data.message}`);
   }
-}
-registerHandler("on_clangd_lsp_server_error", on_clangd_lsp_server_error);
-
-// Register hook for LSP server errors
-editor.on("lsp_server_error", "on_clangd_lsp_server_error");
+});
 
 /**
  * Handle status bar click when there's a C/C++ LSP error
  */
-function on_clangd_lsp_status_clicked(
-  data: LspStatusClickedData
-): void {
+
+
+// Register hook for status bar clicks
+editor.on("lsp_status_clicked", (data) => {
   // Only handle C/C++ language clicks when there's an error
   if (!HANDLED_LANGUAGES.includes(data.language) || !clangdLspError) {
     return;
@@ -111,18 +109,15 @@ function on_clangd_lsp_status_clicked(
       { id: "dismiss", label: "Dismiss (ESC)" },
     ],
   });
-}
-registerHandler("on_clangd_lsp_status_clicked", on_clangd_lsp_status_clicked);
-
-// Register hook for status bar clicks
-editor.on("lsp_status_clicked", "on_clangd_lsp_status_clicked");
+});
 
 /**
  * Handle action popup results for C/C++ LSP help
  */
-function on_clangd_lsp_action_result(
-  data: ActionPopupResultData
-): void {
+
+
+// Register hook for action popup results
+editor.on("action_popup_result", (data) => {
   // Only handle our popup
   if (data.popup_id !== "clangd-lsp-help") {
     return;
@@ -162,10 +157,6 @@ function on_clangd_lsp_action_result(
     default:
       editor.debug(`clangd-lsp: Unknown action: ${data.action_id}`);
   }
-}
-registerHandler("on_clangd_lsp_action_result", on_clangd_lsp_action_result);
-
-// Register hook for action popup results
-editor.on("action_popup_result", "on_clangd_lsp_action_result");
+});
 
 editor.debug("clangd-lsp: Plugin loaded");