@fresh-editor/fresh-editor 0.3.5 → 0.3.7

package/plugins/dashboard.ts

@@ -201,11 +201,6 @@ type RegisteredSection = {
 let dashboardBufferId: number | null = null;
 let fetchToken = 0; // bumped each open; late fetches from a prior open no-op.
 
-// Id of the in-flight slide-in, so we can cancel it when starting a
-// new one (on content change) or when the dashboard is closed
-// mid-slide. Null once the animation settles or is cleared.
-let activeAnimationId: number | null = null;
-
 // Hash of all entries at the last paint (post-focus-highlight too —
 // it's what ultimately lands in the virtual buffer). Used to decide
 // whether setVirtualBufferContent needs to run at all: identical
@@ -213,43 +208,11 @@ let activeAnimationId: number | null = null;
 // round-trip entirely.
 let lastPaintedFullKey: string | null = null;
 
-// Hash of the entries with the clock stamp stripped. Animations only
-// fire when THIS hash changes, so the 1 Hz clock tick on the top
-// frame updates in place without re-sliding the whole dashboard.
-// Keyboard focus changes don't move this hash either (the hash is
-// taken before the focus overlay is laid on top), so Tab/Shift-Tab
-// pan the highlight without re-animating.
-let lastPaintedStructuralKey: string | null = null;
-
 // focusedIndex the last successful setVirtualBufferContent ran with.
-// Paired with the keys above so we can tell "focus moved but section
-// data is the same" (update VB for the highlight, no animation).
+// Paired with the key above so we can tell "focus moved but content
+// is the same" and still update VB for the highlight.
 let lastPaintedFocusedIndex = -1;
 
-// Matches an HH:MM:SS clock stamp. Anything shaped like that is
-// stripped from the structural hash so clock ticks don't animate.
-// The frame renderer is the only dashboard author that emits such a
-// string; if a third-party section happens to show a value in the
-// same shape, the worst case is "we don't re-animate when that
-// value changes" — acceptable noise floor.
-const CLOCK_RE = /\d\d:\d\d:\d\d/g;
-
-// Edge the slide-in enters from. Maps 1:1 to the plugin API's `from`
-// field and is resolved from config (plugins.dashboard.slide_from) on
-// each paint() so hot-reload of the setting Just Works. Defaults to
-// "right" (new content pushes in from the right, old exits left).
-type SlideFrom = "top" | "bottom" | "left" | "right";
-function resolveSlideFrom(): SlideFrom {
-    const config = editor.getConfig() as Record<string, unknown> | null;
-    const plugins = config?.plugins as Record<string, unknown> | undefined;
-    const dashCfg = plugins?.dashboard as Record<string, unknown> | undefined;
-    const raw = dashCfg?.slide_from;
-    if (raw === "top" || raw === "bottom" || raw === "left" || raw === "right") {
-        return raw;
-    }
-    return "right";
-}
-
 // Registered sections, in render order. Built-ins are registered at
 // plugin load (see the bottom of this file); third-party plugins
 // append via the exported `registerSection` API.
@@ -735,6 +698,13 @@ function paint(dims?: { width: number; height: number }) {
     const entries: TextPropertyEntry[] = [];
     for (let i = 0; i < topPad; i++) entries.push({ text: "\n" });
     for (const e of drawToEntries(drawn)) entries.push(e);
+    // Pad below the frame so the buffer covers the full viewport height.
+    // Without this, rows past the last frame line render with
+    // `editor.after_eof_bg` (a deliberate shade off from `editor.bg` to mark
+    // end-of-file in code buffers) and show up as a different-colored strip
+    // at the bottom of the dashboard.
+    const bottomPad = Math.max(0, height - topPad - frameHeight);
+    for (let i = 0; i < bottomPad; i++) entries.push({ text: "\n" });
 
     // Translate frame-relative row actions to absolute buffer rows by
     // shifting by the vertical padding we just prepended. Columns are
@@ -775,32 +745,15 @@ function paint(dims?: { width: number; height: number }) {
             ((focusedIndex % targets.length) + targets.length) % targets.length;
     }
 
-    // Two hashes, taken BEFORE the focus highlight goes on top:
-    //   fullKey      — everything including the clock. Drives the
-    //                  setVirtualBufferContent skip check, so the
-    //                  clock still redraws in place every second.
-    //   structuralKey — clock stamps stripped. Drives the animation.
-    //                  A clock tick alone does not flip this, so it
-    //                  updates silently; a real section data change
-    //                  does, and the slide fires.
+    // Taken BEFORE the focus highlight goes on top — fullKey captures
+    // everything (including the clock) that ultimately lands in the
+    // virtual buffer. Drives the setVirtualBufferContent skip check,
+    // so the clock still redraws in place every second.
     const fullKey = JSON.stringify(entries);
-    const structuralKey = fullKey.replace(CLOCK_RE, "##:##:##");
     const fullChanged = fullKey !== lastPaintedFullKey;
-    const structuralChanged = structuralKey !== lastPaintedStructuralKey;
     const focusChanged = focusedIndex !== lastPaintedFocusedIndex;
-    // A resize / viewport-shape change reshapes frame padding, dash
-    // runs, and centering, which flips the structural hash even when
-    // section data is unchanged. We repaint so the new layout takes
-    // effect but skip the slide — nothing NEW showed up, the user is
-    // just resizing a window. openDashboard clears lastPaintedW/H to
-    // -1 so the first paint after open doesn't trip this guard.
-    const dimsChanged =
-        lastPaintedW !== -1 &&
-        lastPaintedH !== -1 &&
-        (width !== lastPaintedW || height !== lastPaintedH);
-
-    // Identical render → short-circuit. Nothing to push to the
-    // buffer, nothing to animate.
+
+    // Identical render → short-circuit. Nothing to push to the buffer.
     if (!fullChanged && !focusChanged) {
         return;
     }
@@ -838,25 +791,7 @@ function paint(dims?: { width: number; height: number }) {
     lastPaintedW = width;
     lastPaintedH = height;
     lastPaintedFullKey = fullKey;
-    lastPaintedStructuralKey = structuralKey;
     lastPaintedFocusedIndex = focusedIndex;
-
-    // Structural-change-driven re-animation: fire only when the
-    // section payload actually differs AND the dashboard isn't just
-    // reshaping in place (clock tick, focus move, and resize all
-    // land here without animating). Cancel any in-flight slide
-    // first so the new one snapshots the fresh content.
-    if (structuralChanged && !dimsChanged) {
-        if (activeAnimationId !== null) {
-            editor.cancelAnimation(activeAnimationId);
-        }
-        activeAnimationId = editor.animateVirtualBuffer(bufferId, {
-            kind: "slideIn",
-            from: resolveSlideFrom(),
-            durationMs: 520,
-            delayMs: 0,
-        });
-    }
 }
 
 // Open a URL in the user's browser via the platform's "open" helper.
@@ -1613,12 +1548,8 @@ async function openDashboard() {
     }
 
     // Clear the content/focus keys and dims so the first paint after
-    // open is treated as a content change and the slide-in fires.
-    // Dim reset is needed because open is the one case where we DO
-    // want the animation despite "dims changed" (there was no prior
-    // dimension, so the change is really "buffer just appeared").
+    // open is treated as a content change.
     lastPaintedFullKey = null;
-    lastPaintedStructuralKey = null;
     lastPaintedFocusedIndex = -1;
     lastPaintedW = -1;
     lastPaintedH = -1;
@@ -1655,18 +1586,20 @@ async function dashboardShowOrFocus() {
 registerHandler("dashboardShowOrFocus", dashboardShowOrFocus);
 
 // Auto-open resolution: the session override (set via the exported
-// plugin API from init.ts) wins over the user config. We read from
-// getUserConfig (raw file) rather than getConfig because unknown
-// fields are dropped when the Config struct reserializes. Default
-// is true.
+// plugin API from init.ts) wins over the user-configured value, which
+// comes from the typed plugin-config field declared below. The field
+// shows up in the Settings UI under "Plugin Settings → dashboard".
+editor.defineConfigBoolean("autoOpen", {
+    default: true,
+    description: "Show the dashboard automatically when Fresh starts with no real files open.",
+});
+
 let autoOpenOverride: boolean | null = null;
 
 function autoOpenEnabled(): boolean {
     if (autoOpenOverride !== null) return autoOpenOverride;
-    const cfg = editor.getUserConfig() as Record<string, unknown> | null;
-    const plugins = cfg?.plugins as Record<string, unknown> | undefined;
-    const dashboard = plugins?.dashboard as Record<string, unknown> | undefined;
-    return dashboard?.["auto-open"] !== false;
+    const cfg = (editor.getPluginConfig() ?? {}) as { autoOpen?: boolean };
+    return cfg.autoOpen !== false;
 }
 
 function shouldShowDashboard(): boolean {
@@ -1694,10 +1627,6 @@ registerHandler(
         // If the dashboard itself was closed, clear our handle so we'll
         // re-open on the next "last tab closed" event.
         if (dashboardBufferId !== null && e.buffer_id === dashboardBufferId) {
-            if (activeAnimationId !== null) {
-                editor.cancelAnimation(activeAnimationId);
-                activeAnimationId = null;
-            }
             dashboardBufferId = null;
             return;
         }
@@ -1717,10 +1646,6 @@ registerHandler(
     "dashboardOnAfterFileOpen",
     (_e: { buffer_id: number; path: string }) => {
         if (dashboardBufferId === null) return;
-        if (activeAnimationId !== null) {
-            editor.cancelAnimation(activeAnimationId);
-            activeAnimationId = null;
-        }
         editor.closeBuffer(dashboardBufferId);
         dashboardBufferId = null;
     },
@@ -1878,12 +1803,14 @@ editor.exportPluginApi("dashboard", {
 // `plugins.dashboard.enabled` is true in the resolved config — so the
 // standard settings UI is the single enable/disable surface.
 //
-// If the plugin loads mid-session (user toggles it on in Settings),
-// the `ready` hook has already fired, so we also run an immediate
-// check. At startup the `listBuffers().length > 0` guard keeps us
-// dormant until the workspace has actually restored: plugins load
-// before restore, and opening a buffer here would race with the
-// restore and leave a stray Dashboard tab even when real files exist.
+// Auto-open is driven exclusively by the `ready` hook (and the
+// `buffer_closed` handler for the last-tab-closed case). We
+// deliberately do NOT auto-open at module load: dashboard.ts loads
+// during the startup plugin batch, *before* the user's init.ts has
+// been evaluated, so an immediate auto-open would race
+// `setAutoOpen(false)` and dismiss the user's preference. Users who
+// hot-load the plugin mid-session (toggle on in Settings) get the
+// dashboard via the "Show Dashboard" command in the palette.
 editor.on("ready", "dashboardOnReady");
 editor.on("buffer_closed", "dashboardOnBufferClosed");
 editor.on("viewport_changed", "dashboardOnViewportChanged");
@@ -1897,7 +1824,3 @@ editor.registerCommand(
     "Open the dashboard, or bring it to the front if it's already open",
     "dashboardShowOrFocus",
 );
-
-if (editor.listBuffers().length > 0 && shouldShowDashboard()) {
-    openDashboard();
-}

package/plugins/flash.ts

@@ -33,7 +33,24 @@ const VTEXT_PREFIX = "flash-";
 // the closest jump targets get the most comfortable keys.  All
 // lowercase: case-sensitive matching keeps the label letter from also
 // being a valid pattern continuation, which matters for the skip rule.
-const LABEL_POOL = "asdfghjklqwertyuiopzxcvbnm";
+editor.defineConfigString("labelPool", {
+  default: "asdfghjklqwertyuiopzxcvbnm",
+  description: "Characters used as jump labels, in comfort order. Labels are assigned to matches by distance from the cursor, so leftmost characters here land on the nearest matches.",
+});
+editor.defineConfigBoolean("skipRule", {
+  default: true,
+  description: "Skip a label character if it is also the next character after a match — prevents ambiguity between extending the search pattern and jumping.",
+});
+
+function flashSettings(): { labelPool: string; skipRule: boolean } {
+  const cfg = (editor.getPluginConfig() ?? {}) as { labelPool?: string; skipRule?: boolean };
+  return {
+    labelPool: cfg.labelPool && cfg.labelPool.length > 0
+      ? cfg.labelPool
+      : "asdfghjklqwertyuiopzxcvbnm",
+    skipRule: cfg.skipRule ?? true,
+  };
+}
 
 interface Match {
   /** Byte offset where the match starts in its buffer. */
@@ -334,9 +351,10 @@ function assignLabels(
   prevLabelByKey: Map<string, string>,
 ): Match[] {
   if (matches.length === 0) return matches;
-  const skip = buildSkipSet(matches, views, emptyPattern);
+  const { labelPool, skipRule } = flashSettings();
+  const skip = skipRule ? buildSkipSet(matches, views, emptyPattern) : new Set<string>();
   const remaining = new Set<string>();
-  for (const c of LABEL_POOL) if (!skip.has(c)) remaining.add(c);
+  for (const c of labelPool) if (!skip.has(c)) remaining.add(c);
 
   const sorted = sortMatches(matches, startSplitId, startCursor);
 
@@ -353,7 +371,7 @@ function assignLabels(
   // matches in distance order.  Iterate the pool in its native
   // (comfort-ranked) order so home-row letters go to nearest matches.
   const orderedRemaining: string[] = [];
-  for (const c of LABEL_POOL) if (remaining.has(c)) orderedRemaining.push(c);
+  for (const c of labelPool) if (remaining.has(c)) orderedRemaining.push(c);
   let next = 0;
   for (const m of sorted) {
     if (m.label) continue;

package/plugins/git_blame.ts

@@ -87,10 +87,13 @@ const blameState: BlameState = {
 // Color Definitions for Header Styling
 // =============================================================================
 
-const colors = {
-  headerFg: [0, 0, 0] as [number, number, number],           // Black text
-  headerBg: [200, 200, 200] as [number, number, number],     // Light gray background
-};
+// Blame headers are rendered via `addVirtualLine`, which accepts theme
+// keys directly — so we don't expose colors as plugin settings. Themes
+// drive the look; if a theme lacks specific blame keys, these fall
+// through to the editor's status-bar palette which is what every theme
+// defines.
+const HEADER_FG_KEY = "ui.status_bar_fg";
+const HEADER_BG_KEY = "ui.status_bar_bg";
 
 // =============================================================================
 // Mode Definition
@@ -373,7 +376,8 @@ function addBlameHeaders(): void {
   // Clear existing headers first
   editor.clearVirtualTextNamespace(blameState.bufferId, BLAME_NAMESPACE);
 
-  // Add a virtual line above each block
+  // Add a virtual line above each block. Pass theme keys so the headers
+  // restyle automatically when the user switches themes.
   for (const block of blameState.blocks) {
     const headerText = formatBlockHeader(block);
 
@@ -381,7 +385,7 @@ function addBlameHeaders(): void {
       blameState.bufferId,
       block.startByte,        // anchor position
       headerText,             // text content
-      { fg: colors.headerFg, bg: colors.headerBg }, // colors (RGB tuples; passing theme key strings would also work)
+      { fg: HEADER_FG_KEY, bg: HEADER_BG_KEY },
       true,                   // above (LineAbove)
       BLAME_NAMESPACE,        // namespace for bulk removal
       0                       // priority