@fresh-editor/fresh-editor 0.3.1 → 0.3.4

package/plugins/theme_editor.ts

@@ -224,6 +224,30 @@ interface ThemeField {
  */
 let cachedThemeSections: ThemeSection[] | null = null;
 
+/**
+ * Whether a property schema entry refers to `ColorDef` — directly via
+ * `$ref` or wrapped inside an `anyOf` (the schema generator wraps
+ * `Option<ColorDef>` as `anyOf: [{$ref: ColorDef}, {type: null}]`).
+ * Returns false for unrelated $refs such as `ModifierDef`.
+ */
+function fieldRefersToColorDef(fieldObj: Record<string, unknown>): boolean {
+  const refStr = fieldObj["$ref"];
+  if (typeof refStr === "string" && refStr.endsWith("/ColorDef")) {
+    return true;
+  }
+  const anyOf = fieldObj["anyOf"];
+  if (Array.isArray(anyOf)) {
+    for (const variant of anyOf) {
+      if (variant && typeof variant === "object") {
+        const v = variant as Record<string, unknown>;
+        const r = v["$ref"];
+        if (typeof r === "string" && r.endsWith("/ColorDef")) return true;
+      }
+    }
+  }
+  return false;
+}
+
 /**
  * Load theme sections from the Rust API.
  * Parses the raw JSON Schema and resolves $ref references.
@@ -258,8 +282,12 @@ function loadThemeSections(): ThemeSection[] {
   const sectionOrder = ["editor", "ui", "search", "diagnostic", "syntax"];
 
   for (const [sectionName, sectionSchema] of Object.entries(properties)) {
-    // Skip "name" field - it's not a color section
-    if (sectionName === "name") continue;
+    // Skip top-level fields that aren't color sections: `name` is the
+    // theme's identity and `extends` is the inheritance pointer (a string,
+    // not a section). Without this check, the plugin would emit
+    // `"extends": {}` when serializing back out, which fails to round-trip
+    // as a `ThemeFile`.
+    if (sectionName === "name" || sectionName === "extends") continue;
 
     const sectionObj = sectionSchema as Record<string, unknown>;
     const sectionDesc = (sectionObj.description as string) || "";
@@ -276,6 +304,14 @@ function loadThemeSections(): ThemeSection[] {
       const fieldObj = fieldSchema as Record<string, unknown>;
       const fieldDesc = (fieldObj.description as string) || "";
 
+      // Skip non-color fields (e.g. `selection_modifier`, which is a
+      // string array of SGR text-attribute names). The theme editor only
+      // knows how to format and edit `ColorDef` values; if it tried to
+      // hand a modifier-array to `formatColorValue` it would treat the
+      // array as an RGB tuple and crash inside `rgbToHex` when the second
+      // element turns out to be undefined.
+      if (!fieldRefersToColorDef(fieldObj)) continue;
+
       // Generate i18n keys from field names
       const i18nName = `field.${fieldName}`;
       const i18nDesc = `field.${fieldName}_desc`;
@@ -685,59 +721,31 @@ function setNestedValue(obj: Record<string, unknown>, path: string, value: unkno
 }
 
 /**
- * Find themes directory
+ * Load theme registry and populate state.themeRegistry + state.builtinKeys.
+ *
+ * Themes come pre-merged from the Rust registry (builtins + user dir +
+ * packages + bundles), keyed by canonical registry key with `_key`/`_pack`
+ * metadata baked in — same data the native `select_theme` prompt sees.
  */
-function findThemesDir(): string {
-  const cwd = editor.getCwd();
-  const candidates = [
-    editor.pathJoin(cwd, "themes"),
-  ];
+async function loadThemeRegistry(): Promise<void> {
+  const themes = editor.getAllThemes() as Record<string, Record<string, unknown>>;
 
-  for (const path of candidates) {
-    if (editor.fileExists(path)) {
-      return path;
-    }
-  }
+  state.themeRegistry = new Map();
+  state.builtinKeys = new Set();
 
-  return candidates[0];
-}
+  for (const [key, data] of Object.entries(themes)) {
+    const name = (data?.name as string) || key;
+    const pack = (data?._pack as string) || "";
 
-/**
- * Load list of available built-in themes
- */
-/**
- * Load all themes from the registry, returning a map of key → display name.
- *
- * The registry is keyed by unique keys (repo URLs, file:// paths, or bare
- * names for builtins). Each value contains a `name` field (display name)
- * and `_key`/`_pack` metadata.
- */
-/**
- * Load theme registry and populate state.themeRegistry + state.builtinKeys.
- */
-async function loadThemeRegistry(): Promise<void> {
-  try {
-    editor.debug("[theme_editor] loadThemeRegistry: calling editor.getBuiltinThemes()");
-    const rawThemes = editor.getBuiltinThemes();
-    const themes = typeof rawThemes === "string"
-      ? JSON.parse(rawThemes) as Record<string, Record<string, unknown>>
-      : rawThemes as Record<string, Record<string, unknown>>;
-    state.themeRegistry = new Map();
-    state.builtinKeys = new Set();
-    for (const [key, data] of Object.entries(themes)) {
-      const name = (data?.name as string) || key;
-      const pack = (data?._pack as string) || "";
-      state.themeRegistry.set(key, {name, pack});
-      // Builtin themes have an empty pack; user themes start with "user"
-      if (!pack || (!pack.startsWith("user") && !pack.startsWith("pkg"))) {
-        state.builtinKeys.add(key);
-      }
+    state.themeRegistry.set(key, { name, pack });
+
+    // Builtin themes have an empty pack; user themes start with "user"
+    if (!pack || (!pack.startsWith("user") && !pack.startsWith("pkg"))) {
+      state.builtinKeys.add(key);
     }
-    editor.debug(`[theme_editor] loadThemeRegistry: loaded ${state.themeRegistry.size} themes (${state.builtinKeys.size} builtin)`);
-  } catch (e) {
-    editor.debug(`[theme_editor] Failed to load theme registry: ${e}`);
-    throw e;
   }
+
+  editor.debug(`[theme_editor] loadThemeRegistry: loaded ${state.themeRegistry.size} themes (${state.builtinKeys.size} builtin)`);
 }
 
 /**
@@ -2592,7 +2600,7 @@ async function open_theme_editor() : Promise<void> {
   state.sourceSplitId = editor.getActiveSplitId();
   state.sourceBufferId = editor.getActiveBufferId();
 
-  editor.debug("[theme_editor] loading builtin themes...");
+  editor.debug("[theme_editor] loading themes...");
   // Load available themes
   await loadThemeRegistry();
   editor.debug(`[theme_editor] loaded ${state.themeRegistry.size} themes (${state.builtinKeys.size} builtin)`);

package/plugins/tsconfig.json

@@ -57,6 +57,7 @@
     "julia-lsp.ts",
     "kotlin-lsp.ts",
     "latex-lsp.ts",
+    "live_diff.ts",
     "live_grep.ts",
     "lua-lsp.ts",
     "markdown_compose.ts",

package/themes/dark.json

@@ -40,6 +40,8 @@
     "menu_disabled_bg": [50, 50, 50],
     "status_bar_fg": "White",
     "status_bar_bg": [30, 30, 30],
+    "status_palette_fg": [255, 255, 255],
+    "status_palette_bg": [70, 130, 180],
     "prompt_fg": "White",
     "prompt_bg": [20, 20, 20],
     "prompt_selection_fg": "White",
@@ -48,6 +50,8 @@
     "popup_bg": [30, 30, 30],
     "popup_selection_bg": [58, 79, 120],
     "popup_text_fg": "White",
+    "settings_selected_bg": [58, 79, 120],
+    "settings_selected_fg": [255, 255, 255],
     "suggestion_bg": [30, 30, 30],
     "suggestion_selected_bg": [58, 79, 120],
     "help_bg": "Black",

package/themes/dracula.json

@@ -23,6 +23,8 @@
     "tab_hover_bg": [80, 83, 100],
     "status_bar_fg": [40, 42, 54],
     "status_bar_bg": [189, 147, 249],
+    "status_palette_fg": [40, 42, 54],
+    "status_palette_bg": [139, 233, 253],
     "prompt_fg": [40, 42, 54],
     "prompt_bg": [80, 250, 123],
     "prompt_selection_fg": [248, 248, 242],

package/themes/high-contrast.json

@@ -40,6 +40,8 @@
     "menu_disabled_bg": [20, 20, 20],
     "status_bar_fg": [255, 255, 255],
     "status_bar_bg": [20, 20, 20],
+    "status_palette_fg": [0, 0, 0],
+    "status_palette_bg": [0, 255, 255],
     "prompt_fg": [255, 255, 255],
     "prompt_bg": [10, 10, 10],
     "prompt_selection_fg": [255, 255, 255],
@@ -48,6 +50,8 @@
     "popup_bg": [0, 0, 0],
     "popup_selection_bg": [0, 100, 200],
     "popup_text_fg": [255, 255, 255],
+    "settings_selected_bg": [0, 100, 200],
+    "settings_selected_fg": [255, 255, 255],
     "suggestion_bg": [0, 0, 0],
     "suggestion_selected_bg": [0, 100, 200],
     "help_bg": [0, 0, 0],

package/themes/light.json

@@ -40,6 +40,8 @@
     "menu_disabled_bg": [248, 248, 248],
     "status_bar_fg": [0, 0, 0],
     "status_bar_bg": [220, 220, 220],
+    "status_palette_fg": [255, 255, 255],
+    "status_palette_bg": [70, 130, 180],
     "prompt_fg": [0, 0, 0],
     "prompt_bg": [230, 240, 250],
     "prompt_selection_fg": [0, 0, 0],
@@ -48,6 +50,8 @@
     "popup_bg": [232, 238, 245],
     "popup_selection_bg": [209, 226, 243],
     "popup_text_fg": [30, 30, 30],
+    "settings_selected_bg": [173, 214, 255],
+    "settings_selected_fg": [0, 0, 0],
     "suggestion_bg": [232, 238, 245],
     "popup_selection_fg": [0, 0, 0],
     "suggestion_selected_bg": [209, 226, 243],

package/themes/nord.json

@@ -18,6 +18,8 @@
     "tab_separator_bg": [46, 52, 64],
     "status_bar_fg": [46, 52, 64],
     "status_bar_bg": [136, 192, 208],
+    "status_palette_fg": [236, 239, 244],
+    "status_palette_bg": [94, 129, 172],
     "prompt_fg": [46, 52, 64],
     "prompt_bg": [163, 190, 140],
     "prompt_selection_fg": [236, 239, 244],
@@ -27,6 +29,11 @@
     "popup_selection_bg": [94, 129, 172],
     "popup_selection_fg": [236, 239, 244],
     "popup_text_fg": [216, 222, 233],
+    "menu_fg": [216, 222, 233],
+    "menu_highlight_bg": [94, 129, 172],
+    "menu_highlight_fg": [236, 239, 244],
+    "menu_hover_bg": [67, 76, 94],
+    "menu_hover_fg": [216, 222, 233],
     "suggestion_bg": [59, 66, 82],
     "suggestion_selected_bg": [94, 129, 172],
     "help_bg": [46, 52, 64],

package/themes/nostalgia.json

@@ -38,6 +38,8 @@
     "menu_disabled_bg": [170, 170, 170],
     "status_bar_fg": [0, 0, 0],
     "status_bar_bg": [0, 170, 170],
+    "status_palette_fg": [255, 255, 255],
+    "status_palette_bg": [0, 170, 0],
     "prompt_fg": [255, 255, 85],
     "prompt_bg": [0, 0, 170],
     "prompt_selection_fg": [0, 0, 0],
@@ -46,6 +48,8 @@
     "popup_bg": [0, 0, 170],
     "popup_selection_bg": [0, 170, 0],
     "popup_text_fg": [255, 255, 85],
+    "settings_selected_bg": [170, 0, 170],
+    "settings_selected_fg": [255, 255, 255],
     "suggestion_bg": [0, 0, 170],
     "suggestion_selected_bg": [0, 170, 0],
     "help_bg": [0, 0, 170],

package/themes/solarized-dark.json

@@ -18,6 +18,8 @@
     "tab_separator_bg": [0, 43, 54],
     "status_bar_fg": [0, 43, 54],
     "status_bar_bg": [147, 161, 161],
+    "status_palette_fg": [253, 246, 227],
+    "status_palette_bg": [38, 139, 210],
     "prompt_fg": [0, 43, 54],
     "prompt_bg": [181, 137, 0],
     "prompt_selection_fg": [253, 246, 227],
@@ -27,6 +29,11 @@
     "popup_selection_bg": [38, 139, 210],
     "popup_selection_fg": [253, 246, 227],
     "popup_text_fg": [147, 161, 161],
+    "menu_fg": [147, 161, 161],
+    "menu_highlight_bg": [38, 139, 210],
+    "menu_highlight_fg": [253, 246, 227],
+    "menu_hover_bg": [88, 110, 117],
+    "menu_hover_fg": [253, 246, 227],
     "suggestion_bg": [7, 54, 66],
     "suggestion_selected_bg": [38, 139, 210],
     "help_bg": [0, 43, 54],

package/themes/terminal.json

@@ -0,0 +1,128 @@
+{
+  "name": "terminal",
+  "editor": {
+    "bg": "Default",
+    "fg": "Default",
+    "cursor": "Default",
+    "inactive_cursor": "DarkGray",
+    "selection_bg": "Default",
+    "selection_modifier": ["reversed"],
+    "current_line_bg": "Default",
+    "line_number_fg": "DarkGray",
+    "line_number_bg": "Default",
+    "diff_add_bg": "Green",
+    "diff_remove_bg": "Red",
+    "diff_add_highlight_bg": "LightGreen",
+    "diff_remove_highlight_bg": "LightRed",
+    "diff_modify_bg": "Yellow",
+    "ruler_bg": "DarkGray",
+    "whitespace_indicator_fg": "DarkGray",
+    "after_eof_bg": "Default"
+  },
+  "ui": {
+    "tab_active_fg": "Yellow",
+    "tab_active_bg": "Default",
+    "tab_inactive_fg": "Gray",
+    "tab_inactive_bg": "Default",
+    "tab_separator_bg": "Default",
+    "tab_close_hover_fg": "Red",
+    "tab_hover_bg": "DarkGray",
+    "menu_bg": "Default",
+    "menu_fg": "Default",
+    "menu_active_bg": "Blue",
+    "menu_active_fg": "White",
+    "menu_dropdown_bg": "Default",
+    "menu_dropdown_fg": "Default",
+    "menu_highlight_bg": "Blue",
+    "menu_highlight_fg": "White",
+    "menu_border_fg": "DarkGray",
+    "menu_separator_fg": "DarkGray",
+    "menu_hover_bg": "DarkGray",
+    "menu_hover_fg": "White",
+    "menu_disabled_fg": "DarkGray",
+    "menu_disabled_bg": "Default",
+    "status_bar_fg": "Default",
+    "status_bar_bg": "Default",
+    "status_palette_fg": "White",
+    "status_palette_bg": "Magenta",
+    "status_lsp_on_fg": "Default",
+    "status_lsp_on_bg": "Default",
+    "status_lsp_actionable_fg": "Black",
+    "status_lsp_actionable_bg": "Yellow",
+    "prompt_fg": "Default",
+    "prompt_bg": "Default",
+    "prompt_selection_fg": "White",
+    "prompt_selection_bg": "Blue",
+    "popup_border_fg": "Gray",
+    "popup_bg": "Default",
+    "popup_selection_bg": "Blue",
+    "popup_selection_fg": "White",
+    "popup_text_fg": "Default",
+    "suggestion_bg": "Default",
+    "suggestion_selected_bg": "Blue",
+    "help_bg": "Default",
+    "help_fg": "Default",
+    "help_key_fg": "Cyan",
+    "help_separator_fg": "DarkGray",
+    "help_indicator_fg": "Red",
+    "help_indicator_bg": "Default",
+    "inline_code_bg": "DarkGray",
+    "split_separator_fg": "DarkGray",
+    "split_separator_hover_fg": "Cyan",
+    "scrollbar_track_fg": "DarkGray",
+    "scrollbar_thumb_fg": "Gray",
+    "scrollbar_track_hover_fg": "Gray",
+    "scrollbar_thumb_hover_fg": "White",
+    "compose_margin_bg": "Default",
+    "semantic_highlight_bg": "Default",
+    "semantic_highlight_modifier": ["bold", "underlined"],
+    "terminal_bg": "Default",
+    "terminal_fg": "Default",
+    "status_warning_indicator_bg": "Yellow",
+    "status_warning_indicator_fg": "Black",
+    "status_error_indicator_bg": "Red",
+    "status_error_indicator_fg": "White",
+    "status_warning_indicator_hover_bg": "LightYellow",
+    "status_warning_indicator_hover_fg": "Black",
+    "status_error_indicator_hover_bg": "LightRed",
+    "status_error_indicator_hover_fg": "White",
+    "tab_drop_zone_bg": "Blue",
+    "tab_drop_zone_border": "Cyan",
+    "settings_selected_bg": "Blue",
+    "settings_selected_fg": "White",
+    "file_status_added_fg": "Green",
+    "file_status_modified_fg": "Yellow",
+    "file_status_deleted_fg": "Red",
+    "file_status_renamed_fg": "Cyan",
+    "file_status_untracked_fg": "Gray",
+    "file_status_conflicted_fg": "Magenta"
+  },
+  "search": {
+    "match_bg": "Yellow",
+    "match_fg": "Black",
+    "label_bg": "Magenta",
+    "label_fg": "White"
+  },
+  "diagnostic": {
+    "error_fg": "Red",
+    "error_bg": "Default",
+    "warning_fg": "Yellow",
+    "warning_bg": "Default",
+    "info_fg": "Blue",
+    "info_bg": "Default",
+    "hint_fg": "Gray",
+    "hint_bg": "Default"
+  },
+  "syntax": {
+    "keyword": "Red",
+    "string": "Green",
+    "comment": "DarkGray",
+    "function": "Blue",
+    "type": "Yellow",
+    "variable": "Default",
+    "constant": "Magenta",
+    "operator": "Default",
+    "punctuation_bracket": "Default",
+    "punctuation_delimiter": "Default"
+  }
+}