@fresh-editor/fresh-editor 0.2.25 → 0.3.1

package/plugins/theme_editor.ts

@@ -1637,11 +1637,66 @@ function findMatchingColor(input: string): string | null {
 /**
  * Handle color prompt confirmation
  */
-function onThemeColorPromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): boolean {
+
+
+/**
+ * Handle open theme prompt (both builtin and user themes)
+ */
+
+
+/**
+ * Handle save as prompt
+ */
+
+
+/**
+ * Handle prompt cancellation
+ */
+
+
+/**
+ * Handle initial theme selection prompt (when opening editor)
+ */
+
+
+// Register prompt handlers
+editor.on("prompt_confirmed", async (args) => {
+  editor.debug(`[theme_editor] onThemeSelectInitialPromptConfirmed called with: ${JSON.stringify(args)}`);
+  if (args.prompt_type !== "theme-select-initial") {
+    editor.debug(`[theme_editor] prompt_type mismatch, expected 'theme-select-initial', got '${args.prompt_type}'`);
+    return true;
+  }
+  editor.debug(`[theme_editor] prompt_type matched, processing selection...`);
+
+  const key = args.input.trim();
+  const isBuiltin = state.builtinKeys.has(key);
+  const entry = state.themeRegistry.get(key);
+  const themeName = entry?.name || key;
+
+  editor.debug(editor.t("status.loading"));
+
+  const themeData = loadThemeFile(key);
+  if (themeData) {
+    state.themeData = deepClone(themeData);
+    state.originalThemeData = deepClone(themeData);
+    state.themeName = themeName;
+    state.themeKey = key;
+    state.themePath = null;
+    state.isBuiltin = isBuiltin;
+    state.hasChanges = false;
+  } else {
+    editor.setStatus(`Failed to load theme '${themeName}'`);
+    return true;
+  }
+
+  // Now open the editor with loaded theme
+  editor.debug(`[theme_editor] About to call doOpenThemeEditor()`);
+  await doOpenThemeEditor();
+  editor.debug(`[theme_editor] doOpenThemeEditor() completed`);
+
+  return true;
+});
+editor.on("prompt_confirmed", (args) => {
   if (!args.prompt_type.startsWith("theme-color-")) return true;
 
   const path = args.prompt_type.replace("theme-color-", "");
@@ -1688,17 +1743,8 @@ function onThemeColorPromptConfirmed(args: {
   }
 
   return true;
-}
-registerHandler("onThemeColorPromptConfirmed", onThemeColorPromptConfirmed);
-
-/**
- * Handle open theme prompt (both builtin and user themes)
- */
-async function onThemeOpenPromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): Promise<boolean> {
+});
+editor.on("prompt_confirmed", (args) => {
   if (args.prompt_type !== "theme-open") return true;
 
   const key = args.input.trim();
@@ -1723,17 +1769,8 @@ async function onThemeOpenPromptConfirmed(args: {
   }
 
   return true;
-}
-registerHandler("onThemeOpenPromptConfirmed", onThemeOpenPromptConfirmed);
-
-/**
- * Handle save as prompt
- */
-async function onThemeSaveAsPromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): Promise<boolean> {
+});
+editor.on("prompt_confirmed", async (args) => {
   if (args.prompt_type !== "theme-save-as") return true;
 
   const name = args.input.trim();
@@ -1789,80 +1826,88 @@ async function onThemeSaveAsPromptConfirmed(args: {
   }
 
   return true;
-}
-registerHandler("onThemeSaveAsPromptConfirmed", onThemeSaveAsPromptConfirmed);
-
-/**
- * Handle prompt cancellation
- */
-function onThemePromptCancelled(args: { prompt_type: string }) : boolean {
-  if (!args.prompt_type.startsWith("theme-")) return true;
+});
+editor.on("prompt_confirmed", (args) => {
+  if (args.prompt_type !== "theme-discard-confirm") return true;
 
-  // Clear saved state on cancellation
-  state.savedCursorPath = null;
-  state.pendingSaveName = null;
-  state.closeAfterSave = false;
-  state.filterActive = false;
+  const response = args.input.trim().toLowerCase();
+  if (response === "discard" || args.selected_index === 2) {
+    editor.setStatus(editor.t("status.unsaved_discarded"));
+    doCloseEditor();
+  } else if (response === "save" || args.selected_index === 1) {
+    state.closeAfterSave = true;
+    theme_editor_save();
+  } else {
+    editor.debug(editor.t("status.cancelled"));
+  }
 
-  editor.debug(editor.t("status.cancelled"));
-  return true;
-}
-registerHandler("onThemePromptCancelled", onThemePromptCancelled);
+  return false;
+});
+editor.on("prompt_confirmed", async (args) => {
+  if (args.prompt_type !== "theme-overwrite-confirm") return true;
 
-/**
- * Handle initial theme selection prompt (when opening editor)
- */
-async function onThemeSelectInitialPromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): Promise<boolean> {
-  editor.debug(`[theme_editor] onThemeSelectInitialPromptConfirmed called with: ${JSON.stringify(args)}`);
-  if (args.prompt_type !== "theme-select-initial") {
-    editor.debug(`[theme_editor] prompt_type mismatch, expected 'theme-select-initial', got '${args.prompt_type}'`);
-    return true;
+  const response = args.input.trim().toLowerCase();
+  if (response === "overwrite" || args.selected_index === 0) {
+    // Use pending name if set (from Save As), otherwise use current name
+    const nameToSave = state.pendingSaveName || state.themeName;
+    state.themeName = nameToSave;
+    state.themeData.name = nameToSave;
+    state.pendingSaveName = null;
+    const restorePath = state.savedCursorPath;
+    state.savedCursorPath = null;
+    await saveTheme(nameToSave, restorePath);
+  } else {
+    state.pendingSaveName = null;
+    state.savedCursorPath = null;
+    state.closeAfterSave = false;
+    editor.debug(editor.t("status.cancelled"));
   }
-  editor.debug(`[theme_editor] prompt_type matched, processing selection...`);
 
-  const key = args.input.trim();
-  const isBuiltin = state.builtinKeys.has(key);
-  const entry = state.themeRegistry.get(key);
-  const themeName = entry?.name || key;
+  return false;
+});
+editor.on("prompt_confirmed", async (args) => {
+  if (args.prompt_type !== "theme-delete-confirm") return true;
 
-  editor.debug(editor.t("status.loading"));
+  const value = args.input.trim();
+  if (value === "delete" || value === editor.t("prompt.delete_yes")) {
+    if (state.themeName) {
+      try {
+        // Delete the theme file by name
+        await editor.deleteTheme(state.themeName);
+        const deletedName = state.themeName;
 
-  const themeData = loadThemeFile(key);
-  if (themeData) {
-    state.themeData = deepClone(themeData);
-    state.originalThemeData = deepClone(themeData);
-    state.themeName = themeName;
-    state.themeKey = key;
-    state.themePath = null;
-    state.isBuiltin = isBuiltin;
-    state.hasChanges = false;
+        // Reset to default theme
+        state.themeData = createDefaultTheme();
+        state.originalThemeData = deepClone(state.themeData);
+        state.themeName = "";
+        state.themeKey = "";
+        state.themePath = null;
+        state.hasChanges = false;
+        updateDisplay();
+
+        editor.setStatus(editor.t("status.deleted", { name: deletedName }));
+      } catch (e) {
+        editor.setStatus(editor.t("status.delete_failed", { error: String(e) }));
+      }
+    }
   } else {
-    editor.setStatus(`Failed to load theme '${themeName}'`);
-    return true;
+    editor.debug(editor.t("status.cancelled"));
   }
 
-  // Now open the editor with loaded theme
-  editor.debug(`[theme_editor] About to call doOpenThemeEditor()`);
-  await doOpenThemeEditor();
-  editor.debug(`[theme_editor] doOpenThemeEditor() completed`);
-
   return true;
-}
-registerHandler("onThemeSelectInitialPromptConfirmed", onThemeSelectInitialPromptConfirmed);
+});
+editor.on("prompt_cancelled", (args) => {
+  if (!args.prompt_type.startsWith("theme-")) return true;
 
-// Register prompt handlers
-editor.on("prompt_confirmed", "onThemeSelectInitialPromptConfirmed");
-editor.on("prompt_confirmed", "onThemeColorPromptConfirmed");
-editor.on("prompt_confirmed", "onThemeOpenPromptConfirmed");
-editor.on("prompt_confirmed", "onThemeSaveAsPromptConfirmed");
-editor.on("prompt_confirmed", "onThemeDiscardPromptConfirmed");
-editor.on("prompt_confirmed", "onThemeOverwritePromptConfirmed");
-editor.on("prompt_confirmed", "onThemeDeletePromptConfirmed");
-editor.on("prompt_cancelled", "onThemePromptCancelled");
+  // Clear saved state on cancellation
+  state.savedCursorPath = null;
+  state.pendingSaveName = null;
+  state.closeAfterSave = false;
+  state.filterActive = false;
+
+  editor.debug(editor.t("status.cancelled"));
+  return true;
+});
 
 // =============================================================================
 // Theme Operations
@@ -1906,7 +1951,10 @@ async function saveTheme(name?: string, restorePath?: string | null): Promise<bo
 
     state.themePath = savedPath;
     state.themeName = themeName;
-    state.themeKey = `file://${savedPath}`;
+    // Use the portable theme name as the key. The registry resolves names
+    // via its name-fallback, and config persistence strips the absolute
+    // `file://` prefix for user themes (see apply_theme in Rust).
+    state.themeKey = themeName;
     state.isBuiltin = false; // After saving, it's now a user theme
     state.originalThemeData = deepClone(state.themeData);
     state.hasChanges = false;
@@ -2011,13 +2059,9 @@ function createDefaultTheme(): Record<string, unknown> {
 // Cursor Movement Handler
 // =============================================================================
 
-function onThemeEditorCursorMoved(data: {
-  buffer_id: number;
-  cursor_id: number;
-  old_position: number;
-  new_position: number;
-  text_properties?: Array<Record<string, any>>;
-}): void {
+
+
+editor.on("cursor_moved", (data) => {
   if (state.bufferId === null) return;
   // Accept cursor_moved events for any of the buffer group's panels
   // (tree, picker, footer). With buffer groups each panel is its own
@@ -2085,26 +2129,22 @@ function onThemeEditorCursorMoved(data: {
   }
 
   applySelectionHighlighting();
-}
-registerHandler("onThemeEditorCursorMoved", onThemeEditorCursorMoved);
+});
 
-editor.on("cursor_moved", "onThemeEditorCursorMoved");
 
-function onThemeEditorResize(data: { width: number; height: number }): void {
+editor.on("resize", (data) => {
   if (state.bufferId === null) return;
   state.viewportHeight = data.height;
   state.viewportWidth = data.width;
   updateDisplay();
-}
-registerHandler("onThemeEditorResize", onThemeEditorResize);
-editor.on("resize", "onThemeEditorResize");
+});
 
 /**
  * Handle buffer_closed event to reset state when buffer is closed by any means
  */
-function onThemeEditorBufferClosed(data: {
-  buffer_id: number;
-}): void {
+
+
+editor.on("buffer_closed", (data) => {
   if (state.bufferId !== null && data.buffer_id === state.bufferId) {
     // Reset state when our buffer is closed
     state.bufferId = null;
@@ -2119,18 +2159,14 @@ function onThemeEditorBufferClosed(data: {
     state.selectedIndex = 0;
     state.treeScrollOffset = 0;
   }
-}
-registerHandler("onThemeEditorBufferClosed", onThemeEditorBufferClosed);
-
-editor.on("buffer_closed", "onThemeEditorBufferClosed");
+});
 
 /**
  * Handle theme_inspect_key hook: open the theme editor at a specific key
  */
-async function onThemeInspectKey(data: {
-  theme_name: string;
-  key: string;
-}): Promise<void> {
+
+
+editor.on("theme_inspect_key", async (data) => {
   // If already open, focus and navigate to the key
   if (isThemeEditorOpen()) {
     if (state.bufferId !== null) {
@@ -2175,10 +2211,7 @@ async function onThemeInspectKey(data: {
   // Open editor and navigate
   await doOpenThemeEditor();
   moveCursorToField(data.key);
-}
-registerHandler("onThemeInspectKey", onThemeInspectKey);
-
-editor.on("theme_inspect_key", "onThemeInspectKey");
+});
 
 // =============================================================================
 // Smart Navigation - Skip Non-Selectable Lines
@@ -2419,11 +2452,9 @@ registerHandler("theme_editor_filter", theme_editor_filter);
 /**
  * Handle filter prompt confirmation
  */
-function onThemeFilterPromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): boolean {
+
+
+editor.on("prompt_confirmed", (args) => {
   if (args.prompt_type !== "theme-filter") return true;
 
   state.filterText = args.input.trim();
@@ -2432,10 +2463,7 @@ function onThemeFilterPromptConfirmed(args: {
   state.treeScrollOffset = 0;
   updateDisplay();
   return true;
-}
-registerHandler("onThemeFilterPromptConfirmed", onThemeFilterPromptConfirmed);
-
-editor.on("prompt_confirmed", "onThemeFilterPromptConfirmed");
+});
 
 /**
  * Navigate picker vertically (between sections: hex, named-colors, palette)
@@ -2705,27 +2733,7 @@ function doCloseEditor(): void {
 /**
  * Handle discard confirmation prompt
  */
-function onThemeDiscardPromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): boolean {
-  if (args.prompt_type !== "theme-discard-confirm") return true;
-
-  const response = args.input.trim().toLowerCase();
-  if (response === "discard" || args.selected_index === 2) {
-    editor.setStatus(editor.t("status.unsaved_discarded"));
-    doCloseEditor();
-  } else if (response === "save" || args.selected_index === 1) {
-    state.closeAfterSave = true;
-    theme_editor_save();
-  } else {
-    editor.debug(editor.t("status.cancelled"));
-  }
 
-  return false;
-}
-registerHandler("onThemeDiscardPromptConfirmed", onThemeDiscardPromptConfirmed);
 
 /**
  * Edit color at cursor
@@ -2839,33 +2847,7 @@ registerHandler("theme_editor_save", theme_editor_save);
 /**
  * Handle overwrite confirmation prompt
  */
-async function onThemeOverwritePromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): Promise<boolean> {
-  if (args.prompt_type !== "theme-overwrite-confirm") return true;
 
-  const response = args.input.trim().toLowerCase();
-  if (response === "overwrite" || args.selected_index === 0) {
-    // Use pending name if set (from Save As), otherwise use current name
-    const nameToSave = state.pendingSaveName || state.themeName;
-    state.themeName = nameToSave;
-    state.themeData.name = nameToSave;
-    state.pendingSaveName = null;
-    const restorePath = state.savedCursorPath;
-    state.savedCursorPath = null;
-    await saveTheme(nameToSave, restorePath);
-  } else {
-    state.pendingSaveName = null;
-    state.savedCursorPath = null;
-    state.closeAfterSave = false;
-    editor.debug(editor.t("status.cancelled"));
-  }
-
-  return false;
-}
-registerHandler("onThemeOverwritePromptConfirmed", onThemeOverwritePromptConfirmed);
 
 /**
  * Save theme as (new name)
@@ -2943,42 +2925,7 @@ registerHandler("theme_editor_delete", theme_editor_delete);
 /**
  * Handle delete confirmation prompt
  */
-async function onThemeDeletePromptConfirmed(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): Promise<boolean> {
-  if (args.prompt_type !== "theme-delete-confirm") return true;
-
-  const value = args.input.trim();
-  if (value === "delete" || value === editor.t("prompt.delete_yes")) {
-    if (state.themeName) {
-      try {
-        // Delete the theme file by name
-        await editor.deleteTheme(state.themeName);
-        const deletedName = state.themeName;
 
-        // Reset to default theme
-        state.themeData = createDefaultTheme();
-        state.originalThemeData = deepClone(state.themeData);
-        state.themeName = "";
-        state.themeKey = "";
-        state.themePath = null;
-        state.hasChanges = false;
-        updateDisplay();
-
-        editor.setStatus(editor.t("status.deleted", { name: deletedName }));
-      } catch (e) {
-        editor.setStatus(editor.t("status.delete_failed", { error: String(e) }));
-      }
-    }
-  } else {
-    editor.debug(editor.t("status.cancelled"));
-  }
-
-  return true;
-}
-registerHandler("onThemeDeletePromptConfirmed", onThemeDeletePromptConfirmed);
 
 // =============================================================================
 // Command Registration

package/plugins/toml-lsp.ts

@@ -50,7 +50,10 @@ let tomlLspError: { serverCommand: string; message: string } | null = null;
 /**
  * Handle LSP server errors for TOML
  */
-function on_toml_lsp_server_error(data: LspServerErrorData): void {
+
+
+// Register hook for LSP server errors
+editor.on("lsp_server_error", (data) => {
   // Only handle TOML language errors
   if (data.language !== "toml") {
     return;
@@ -72,18 +75,15 @@ function on_toml_lsp_server_error(data: LspServerErrorData): void {
   } else {
     editor.setStatus(`TOML LSP error: ${data.message}`);
   }
-}
-registerHandler("on_toml_lsp_server_error", on_toml_lsp_server_error);
-
-// Register hook for LSP server errors
-editor.on("lsp_server_error", "on_toml_lsp_server_error");
+});
 
 /**
  * Handle status bar click when there's a TOML LSP error
  */
-function on_toml_lsp_status_clicked(
-  data: LspStatusClickedData
-): void {
+
+
+// Register hook for status bar clicks
+editor.on("lsp_status_clicked", (data) => {
   // Only handle TOML language clicks when there's an error
   if (data.language !== "toml" || !tomlLspError) {
     return;
@@ -104,18 +104,15 @@ function on_toml_lsp_status_clicked(
       { id: "dismiss", label: "Dismiss (ESC)" },
     ],
   });
-}
-registerHandler("on_toml_lsp_status_clicked", on_toml_lsp_status_clicked);
-
-// Register hook for status bar clicks
-editor.on("lsp_status_clicked", "on_toml_lsp_status_clicked");
+});
 
 /**
  * Handle action popup results for TOML LSP help
  */
-function on_toml_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 !== "toml-lsp-help") {
     return;
@@ -153,10 +150,6 @@ function on_toml_lsp_action_result(
     default:
       editor.debug(`toml-lsp: Unknown action: ${data.action_id}`);
   }
-}
-registerHandler("on_toml_lsp_action_result", on_toml_lsp_action_result);
-
-// Register hook for action popup results
-editor.on("action_popup_result", "on_toml_lsp_action_result");
+});
 
 editor.debug("toml-lsp: Plugin loaded");

package/plugins/tsconfig.json

@@ -0,0 +1,100 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ES2020",
+    "moduleResolution": "bundler",
+    "moduleDetection": "force",
+    "allowImportingTsExtensions": true,
+    "strict": true,
+    "noEmit": true,
+    "skipLibCheck": true,
+    "lib": ["ES2020"],
+    "types": []
+  },
+  "files": [
+    "lib/fresh.d.ts",
+    "lib/finder.ts",
+    "lib/git_history.ts",
+    "lib/index.ts",
+    "lib/navigation-controller.ts",
+    "lib/panel-manager.ts",
+    "lib/search-utils.ts",
+    "lib/types.ts",
+    "lib/virtual-buffer-factory.ts",
+    "astro-lsp.ts",
+    "audit_mode.ts",
+    "bash-lsp.ts",
+    "clangd-lsp.ts",
+    "clangd_support.ts",
+    "clojure-lsp.ts",
+    "cmake-lsp.ts",
+    "code-tour.ts",
+    "csharp_support.ts",
+    "css-lsp.ts",
+    "dart-lsp.ts",
+    "dashboard.ts",
+    "devcontainer.ts",
+    "diagnostics_panel.ts",
+    "diff_nav.ts",
+    "elixir-lsp.ts",
+    "erlang-lsp.ts",
+    "find_references.ts",
+    "flash.ts",
+    "fsharp-lsp.ts",
+    "git_blame.ts",
+    "git_explorer.ts",
+    "git_find_file.ts",
+    "git_grep.ts",
+    "git_gutter.ts",
+    "git_log.ts",
+    "gleam-lsp.ts",
+    "go-lsp.ts",
+    "graphql-lsp.ts",
+    "haskell-lsp.ts",
+    "html-lsp.ts",
+    "java-lsp.ts",
+    "json-lsp.ts",
+    "julia-lsp.ts",
+    "kotlin-lsp.ts",
+    "latex-lsp.ts",
+    "live_grep.ts",
+    "lua-lsp.ts",
+    "markdown_compose.ts",
+    "markdown_source.ts",
+    "marksman-lsp.ts",
+    "merge_conflict.ts",
+    "nim-lsp.ts",
+    "nix-lsp.ts",
+    "nushell-lsp.ts",
+    "ocaml-lsp.ts",
+    "odin-lsp.ts",
+    "path_complete.ts",
+    "perl-lsp.ts",
+    "php-lsp.ts",
+    "pkg.ts",
+    "protobuf-lsp.ts",
+    "python-lsp.ts",
+    "r-lsp.ts",
+    "ruby-lsp.ts",
+    "rust-lsp.ts",
+    "scala-lsp.ts",
+    "search_replace.ts",
+    "solidity-lsp.ts",
+    "sql-lsp.ts",
+    "svelte-lsp.ts",
+    "swift-lsp.ts",
+    "tailwindcss-lsp.ts",
+    "templ-lsp.ts",
+    "terraform-lsp.ts",
+    "test_i18n.ts",
+    "theme_editor.ts",
+    "toml-lsp.ts",
+    "typescript-lsp.ts",
+    "typst-lsp.ts",
+    "vi_mode.ts",
+    "vue-lsp.ts",
+    "welcome.ts",
+    "yaml-lsp.ts",
+    "zig-lsp.ts"
+  ]
+}