@fresh-editor/fresh-editor 0.1.12 → 0.1.13

package/npm-shrinkwrap.json

@@ -23,7 +23,7 @@
       "hasInstallScript": true,
       "license": "GPL-2.0",
       "name": "@fresh-editor/fresh-editor",
-      "version": "0.1.12"
+      "version": "0.1.13"
     },
     "node_modules/@isaacs/balanced-match": {
       "engines": {
@@ -896,5 +896,5 @@
     }
   },
   "requires": true,
-  "version": "0.1.12"
+  "version": "0.1.13"
 }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "artifactDownloadUrl": "https://github.com/sinelaw/fresh/releases/download/v0.1.12",
+  "artifactDownloadUrl": "https://github.com/sinelaw/fresh/releases/download/v0.1.13",
   "author": "Noam Lewis",
   "bin": {
     "fresh": "run-fresh.js"
@@ -92,7 +92,7 @@
       "zipExt": ".tar.xz"
     }
   },
-  "version": "0.1.12",
+  "version": "0.1.13",
   "volta": {
     "node": "18.14.1",
     "npm": "9.5.0"

package/plugins/buffer_modified.ts

@@ -0,0 +1,245 @@
+/// <reference path="../types/fresh.d.ts" />
+
+/**
+ * Buffer Modified Plugin
+ *
+ * Shows indicators in the gutter for lines that have been modified since the last save.
+ * This tracks in-memory changes, not git changes.
+ *
+ * This plugin uses a simpler approach: it marks lines as modified when edits happen
+ * (after_insert/after_delete hooks), and clears all modified markers on save.
+ * It doesn't compare content - it just tracks which lines have been touched since save.
+ *
+ * Indicator symbols:
+ * - │ (blue): Line has been modified since last save
+ */
+
+// =============================================================================
+// Constants
+// =============================================================================
+
+const NAMESPACE = "buffer-modified";
+const PRIORITY = 5; // Lower than git-gutter (10) and diagnostics
+
+// Colors (RGB) - Blue to distinguish from git gutter (green/yellow/red)
+const COLOR = [100, 149, 237] as [number, number, number]; // Cornflower blue
+
+// Symbol
+const SYMBOL = "│";
+
+// =============================================================================
+// Types
+// =============================================================================
+
+interface BufferState {
+  /** Whether we're tracking this buffer */
+  tracking: boolean;
+}
+
+// =============================================================================
+// State
+// =============================================================================
+
+/** State per buffer */
+const bufferStates: Map<number, BufferState> = new Map();
+
+// =============================================================================
+// Line Tracking
+// =============================================================================
+
+/**
+ * Initialize state for a buffer (on file open)
+ * Starts with no modified lines since file was just loaded
+ */
+function initBufferState(bufferId: number): void {
+  bufferStates.set(bufferId, {
+    tracking: true,
+  });
+  // Clear any leftover indicators
+  editor.clearLineIndicators(bufferId, NAMESPACE);
+}
+
+/**
+ * Clear modified state for a buffer (on save)
+ * Removes all modified markers since buffer now matches disk
+ */
+function clearModifiedState(bufferId: number): void {
+  editor.clearLineIndicators(bufferId, NAMESPACE);
+}
+
+/**
+ * Mark a range of lines as modified and set indicators
+ *
+ * Note: The indicator markers automatically track their byte positions,
+ * so we don't need to manually track which lines are modified - we just
+ * set indicators and they'll stay on the correct lines as edits happen.
+ */
+function markLinesModified(bufferId: number, startLine: number, endLine: number): void {
+  const state = bufferStates.get(bufferId);
+  if (!state || !state.tracking) return;
+
+  // Add indicator for each affected line
+  // Note: If an indicator already exists at this position, it will be updated
+  for (let line = startLine; line <= endLine; line++) {
+    editor.setLineIndicator(
+      bufferId,
+      line,
+      NAMESPACE,
+      SYMBOL,
+      COLOR[0],
+      COLOR[1],
+      COLOR[2],
+      PRIORITY
+    );
+  }
+}
+
+// =============================================================================
+// Event Handlers
+// =============================================================================
+
+/**
+ * Handle after file open - initialize state
+ */
+globalThis.onBufferModifiedAfterFileOpen = function (args: {
+  buffer_id: number;
+  path: string;
+}): boolean {
+  const bufferId = args.buffer_id;
+
+  if (!args.path || args.path === "") {
+    return true;
+  }
+
+  // Initialize tracking - file just loaded, no modifications yet
+  initBufferState(bufferId);
+  editor.debug(`Buffer Modified: initialized for ${args.path}`);
+
+  return true;
+};
+
+/**
+ * Handle buffer activation - ensure we're tracking
+ */
+globalThis.onBufferModifiedBufferActivated = function (args: {
+  buffer_id: number;
+}): boolean {
+  const bufferId = args.buffer_id;
+
+  // If we don't have state yet, initialize it
+  if (!bufferStates.has(bufferId)) {
+    const filePath = editor.getBufferPath(bufferId);
+    if (filePath && filePath !== "") {
+      initBufferState(bufferId);
+    }
+  }
+
+  return true;
+};
+
+/**
+ * Handle after file save - clear modified state
+ */
+globalThis.onBufferModifiedAfterSave = function (args: {
+  buffer_id: number;
+  path: string;
+}): boolean {
+  const bufferId = args.buffer_id;
+
+  // Clear all modified markers - buffer now matches disk
+  clearModifiedState(bufferId);
+  editor.debug("Buffer Modified: cleared on save");
+
+  return true;
+};
+
+/**
+ * Handle after insert - mark affected lines as modified
+ *
+ * Note: Line indicators automatically track position changes via byte-position markers.
+ * We only need to add new indicators for the modified lines; existing indicators
+ * will automatically shift to stay on the correct lines.
+ */
+globalThis.onBufferModifiedAfterInsert = function (args: {
+  buffer_id: number;
+  position: number;
+  text: string;
+  affected_start: number;
+  affected_end: number;
+  start_line: number;
+  end_line: number;
+  lines_added: number;
+}): boolean {
+  const bufferId = args.buffer_id;
+
+  if (!bufferStates.has(bufferId)) {
+    return true;
+  }
+
+  // Mark all affected lines (from start_line to end_line inclusive)
+  // The indicator markers will automatically track their positions
+  markLinesModified(bufferId, args.start_line, args.end_line);
+
+  return true;
+};
+
+/**
+ * Handle after delete - mark affected line as modified
+ *
+ * Note: Line indicators automatically track position changes via byte-position markers.
+ * Markers within deleted ranges are automatically removed. We only need to mark the
+ * line where the deletion occurred.
+ */
+globalThis.onBufferModifiedAfterDelete = function (args: {
+  buffer_id: number;
+  range: { start: number; end: number };
+  deleted_text: string;
+  affected_start: number;
+  deleted_len: number;
+  start_line: number;
+  end_line: number;
+  lines_removed: number;
+}): boolean {
+  const bufferId = args.buffer_id;
+
+  if (!bufferStates.has(bufferId)) {
+    return true;
+  }
+
+  // Mark the line where deletion occurred
+  // Markers for deleted lines are automatically cleaned up
+  markLinesModified(bufferId, args.start_line, args.start_line);
+
+  return true;
+};
+
+/**
+ * Handle buffer closed - cleanup state
+ */
+globalThis.onBufferModifiedBufferClosed = function (args: {
+  buffer_id: number;
+}): boolean {
+  bufferStates.delete(args.buffer_id);
+  return true;
+};
+
+// =============================================================================
+// Registration
+// =============================================================================
+
+// Register event handlers
+editor.on("after_file_open", "onBufferModifiedAfterFileOpen");
+editor.on("buffer_activated", "onBufferModifiedBufferActivated");
+editor.on("after_file_save", "onBufferModifiedAfterSave");
+editor.on("after-insert", "onBufferModifiedAfterInsert");
+editor.on("after-delete", "onBufferModifiedAfterDelete");
+editor.on("buffer_closed", "onBufferModifiedBufferClosed");
+
+// Initialize for the current buffer
+const initBufferId = editor.getActiveBufferId();
+const initPath = editor.getBufferPath(initBufferId);
+if (initPath && initPath !== "") {
+  initBufferState(initBufferId);
+}
+
+editor.debug("Buffer Modified plugin loaded");

package/plugins/git_gutter.ts

@@ -0,0 +1,475 @@
+/// <reference path="../types/fresh.d.ts" />
+
+/**
+ * Git Gutter Plugin
+ *
+ * Shows git diff indicators in the gutter for modified, added, and deleted lines.
+ * Uses `git diff` to compare the current buffer content against the index (staged changes)
+ * or HEAD if nothing is staged.
+ *
+ * Indicator symbols:
+ * - │ (green): Added line
+ * - │ (yellow): Modified line
+ * - ▾ (red): Deleted line(s) below
+ */
+
+// =============================================================================
+// Constants
+// =============================================================================
+
+const NAMESPACE = "git-gutter";
+const PRIORITY = 10; // Lower than diagnostics
+
+// Colors (RGB)
+const COLORS = {
+  added: [80, 250, 123] as [number, number, number],    // Green
+  modified: [255, 184, 108] as [number, number, number], // Orange/Yellow
+  deleted: [255, 85, 85] as [number, number, number],    // Red
+};
+
+// Symbols
+const SYMBOLS = {
+  added: "│",
+  modified: "│",
+  deleted: "▾",
+};
+
+// =============================================================================
+// Types
+// =============================================================================
+
+interface DiffHunk {
+  /** Type of change */
+  type: "added" | "modified" | "deleted";
+  /** Starting line number in the new file (1-indexed) */
+  startLine: number;
+  /** Number of lines affected */
+  lineCount: number;
+}
+
+interface BufferGitState {
+  /** File path for this buffer */
+  filePath: string;
+  /** Last known hunks for this buffer */
+  hunks: DiffHunk[];
+  /** Whether we're currently updating */
+  updating: boolean;
+}
+
+// =============================================================================
+// State
+// =============================================================================
+
+/** Git state per buffer */
+const bufferStates: Map<number, BufferGitState> = new Map();
+
+
+// =============================================================================
+// Git Diff Parsing
+// =============================================================================
+
+/**
+ * Parse unified diff output to extract hunks
+ * Unified diff format:
+ * @@ -start,count +start,count @@
+ */
+function parseDiffOutput(diffOutput: string): DiffHunk[] {
+  const hunks: DiffHunk[] = [];
+  const lines = diffOutput.split("\n");
+
+  let currentOldLine = 0;
+  let currentNewLine = 0;
+  let inHunk = false;
+  let addedStart = 0;
+  let addedCount = 0;
+  let modifiedStart = 0;
+  let modifiedCount = 0;
+  let deletedAtLine = 0;
+  let deletedCount = 0;
+
+  const flushAdded = () => {
+    if (addedCount > 0) {
+      hunks.push({ type: "added", startLine: addedStart, lineCount: addedCount });
+      addedCount = 0;
+    }
+  };
+
+  const flushModified = () => {
+    if (modifiedCount > 0) {
+      hunks.push({ type: "modified", startLine: modifiedStart, lineCount: modifiedCount });
+      modifiedCount = 0;
+    }
+  };
+
+  const flushDeleted = () => {
+    if (deletedCount > 0) {
+      // Deleted lines are shown as a marker on the line after the deletion
+      hunks.push({ type: "deleted", startLine: deletedAtLine, lineCount: deletedCount });
+      deletedCount = 0;
+    }
+  };
+
+  for (const line of lines) {
+    // Match hunk header: @@ -old_start,old_count +new_start,new_count @@
+    const hunkMatch = line.match(/^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/);
+    if (hunkMatch) {
+      // Flush any pending changes from previous hunk
+      flushAdded();
+      flushModified();
+      flushDeleted();
+
+      currentOldLine = parseInt(hunkMatch[1], 10);
+      currentNewLine = parseInt(hunkMatch[3], 10);
+      inHunk = true;
+      continue;
+    }
+
+    if (!inHunk) continue;
+
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      // Added line
+      if (deletedCount > 0) {
+        // If there were deletions right before, this is a modification
+        if (modifiedCount === 0) {
+          modifiedStart = currentNewLine;
+        }
+        modifiedCount++;
+        deletedCount--;
+      } else {
+        // Pure addition
+        if (addedCount === 0) {
+          addedStart = currentNewLine;
+        }
+        addedCount++;
+      }
+      currentNewLine++;
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      // Deleted line - flush any pending additions first
+      flushAdded();
+
+      if (deletedCount === 0) {
+        deletedAtLine = currentNewLine;
+      }
+      deletedCount++;
+      currentOldLine++;
+    } else if (line.startsWith(" ")) {
+      // Context line (unchanged)
+      flushAdded();
+      flushModified();
+      flushDeleted();
+      currentOldLine++;
+      currentNewLine++;
+    } else if (line === "\") {
+      // Ignore this marker
+      continue;
+    }
+  }
+
+  // Flush any remaining changes
+  flushAdded();
+  flushModified();
+  flushDeleted();
+
+  return hunks;
+}
+
+// =============================================================================
+// Git Operations
+// =============================================================================
+
+/**
+ * Get the directory containing a file
+ */
+function getFileDirectory(filePath: string): string {
+  const lastSlash = filePath.lastIndexOf("/");
+  if (lastSlash > 0) {
+    return filePath.substring(0, lastSlash);
+  }
+  return ".";
+}
+
+/**
+ * Check if a file is tracked by git
+ */
+async function isGitTracked(filePath: string): Promise<boolean> {
+  const cwd = getFileDirectory(filePath);
+  const result = await editor.spawnProcess("git", ["ls-files", "--error-unmatch", filePath], cwd);
+  return result.exit_code === 0;
+}
+
+/**
+ * Get git diff for a file
+ * Compares working tree against HEAD to show all uncommitted changes
+ * (both staged and unstaged)
+ */
+async function getGitDiff(filePath: string): Promise<string> {
+  const cwd = getFileDirectory(filePath);
+
+  // Diff against HEAD to show all changes (staged + unstaged) vs last commit
+  const result = await editor.spawnProcess("git", [
+    "diff",
+    "HEAD",
+    "--no-color",
+    "--unified=0", // No context lines for cleaner parsing
+    "--",
+    filePath,
+  ], cwd);
+
+  // Exit code 0 = no differences, 1 = differences found, >1 = error
+  if (result.exit_code <= 1) {
+    return result.stdout;
+  }
+
+  return "";
+}
+
+// =============================================================================
+// Indicator Management
+// =============================================================================
+
+/**
+ * Update git gutter indicators for a buffer
+ */
+async function updateGitGutter(bufferId: number): Promise<void> {
+  const state = bufferStates.get(bufferId);
+  if (!state || state.updating) return;
+
+  state.updating = true;
+
+  try {
+    editor.debug(`Git Gutter: updating for ${state.filePath}`);
+
+    // Check if file is git tracked
+    const tracked = await isGitTracked(state.filePath);
+    if (!tracked) {
+      // Clear indicators for non-tracked files
+      editor.debug("Git Gutter: file not tracked by git");
+      editor.clearLineIndicators(bufferId, NAMESPACE);
+      state.hunks = [];
+      return;
+    }
+
+    editor.debug("Git Gutter: file is tracked, getting diff...");
+
+    // Get diff
+    const diffOutput = await getGitDiff(state.filePath);
+    editor.debug(`Git Gutter: diff output length = ${diffOutput.length}`);
+    if (diffOutput.length > 0 && diffOutput.length < 500) {
+      editor.debug(`Git Gutter: diff = ${diffOutput.replace(/\n/g, "\\n")}`);
+    }
+    const hunks = parseDiffOutput(diffOutput);
+    editor.debug(`Git Gutter: parsed ${hunks.length} hunks`);
+
+    // Clear existing indicators
+    editor.clearLineIndicators(bufferId, NAMESPACE);
+
+    // Apply new indicators
+    for (const hunk of hunks) {
+      const color = COLORS[hunk.type];
+      const symbol = SYMBOLS[hunk.type];
+
+      if (hunk.type === "deleted") {
+        // Deleted indicator shows on a single line
+        // Line numbers are 1-indexed in diff, but 0-indexed in editor
+        const line = Math.max(0, hunk.startLine - 1);
+        editor.setLineIndicator(
+          bufferId,
+          line,
+          NAMESPACE,
+          symbol,
+          color[0],
+          color[1],
+          color[2],
+          PRIORITY
+        );
+      } else {
+        // Added/modified indicators show on each affected line
+        for (let i = 0; i < hunk.lineCount; i++) {
+          // Line numbers are 1-indexed in diff, but 0-indexed in editor
+          const line = hunk.startLine - 1 + i;
+          editor.setLineIndicator(
+            bufferId,
+            line,
+            NAMESPACE,
+            symbol,
+            color[0],
+            color[1],
+            color[2],
+            PRIORITY
+          );
+        }
+      }
+    }
+
+    state.hunks = hunks;
+  } finally {
+    state.updating = false;
+  }
+}
+
+
+// =============================================================================
+// Event Handlers
+// =============================================================================
+
+/**
+ * Handle after file open - initialize git state and update indicators
+ */
+globalThis.onGitGutterAfterFileOpen = function (args: {
+  buffer_id: number;
+  path: string;
+}): boolean {
+  const bufferId = args.buffer_id;
+  const filePath = args.path;
+
+  if (!filePath || filePath === "") {
+    return true;
+  }
+
+  // Initialize state for this buffer
+  bufferStates.set(bufferId, {
+    filePath,
+    hunks: [],
+    updating: false,
+  });
+
+  // Update immediately (no debounce for file open)
+  updateGitGutter(bufferId);
+
+  return true;
+};
+
+/**
+ * Handle buffer activation - update if we have state but indicators might be stale
+ */
+globalThis.onGitGutterBufferActivated = function (args: {
+  buffer_id: number;
+}): boolean {
+  const bufferId = args.buffer_id;
+
+  // If we don't have state yet, try to initialize from buffer path
+  if (!bufferStates.has(bufferId)) {
+    const filePath = editor.getBufferPath(bufferId);
+    if (filePath && filePath !== "") {
+      bufferStates.set(bufferId, {
+        filePath,
+        hunks: [],
+        updating: false,
+      });
+      updateGitGutter(bufferId);
+    }
+  }
+  // If we already have state, the indicators should be current
+  // (they update on file open and save)
+
+  return true;
+};
+
+/**
+ * Handle after file save - refresh indicators
+ */
+globalThis.onGitGutterAfterSave = function (args: {
+  buffer_id: number;
+  path: string;
+}): boolean {
+  const bufferId = args.buffer_id;
+
+  // Update state with new path (in case of save-as)
+  const state = bufferStates.get(bufferId);
+  if (state) {
+    state.filePath = args.path;
+  } else {
+    bufferStates.set(bufferId, {
+      filePath: args.path,
+      hunks: [],
+      updating: false,
+    });
+  }
+
+  // Update immediately after save (no debounce)
+  updateGitGutter(bufferId);
+
+  return true;
+};
+
+// Note: Git diff compares the file on disk, not the in-memory buffer.
+// Line indicators automatically track position changes via byte-position markers.
+// A full re-diff happens on save. For unsaved changes, see buffer_modified plugin.
+
+/**
+ * Handle buffer closed - cleanup state
+ */
+globalThis.onGitGutterBufferClosed = function (args: {
+  buffer_id: number;
+}): boolean {
+  bufferStates.delete(args.buffer_id);
+  return true;
+};
+
+// =============================================================================
+// Commands
+// =============================================================================
+
+/**
+ * Manually refresh git gutter for the current buffer
+ */
+globalThis.git_gutter_refresh = function (): void {
+  const bufferId = editor.getActiveBufferId();
+  const filePath = editor.getBufferPath(bufferId);
+
+  if (!filePath || filePath === "") {
+    editor.setStatus("Git Gutter: No file open");
+    return;
+  }
+
+  // Ensure state exists
+  if (!bufferStates.has(bufferId)) {
+    bufferStates.set(bufferId, {
+      filePath,
+      hunks: [],
+      updating: false,
+    });
+  }
+
+  // Force immediate update
+  updateGitGutter(bufferId).then(() => {
+    const state = bufferStates.get(bufferId);
+    const count = state?.hunks.length || 0;
+    editor.setStatus(`Git Gutter: ${count} change${count !== 1 ? "s" : ""} detected`);
+  });
+};
+
+// =============================================================================
+// Registration
+// =============================================================================
+
+// Register event handlers
+// Note: No need to register after-insert/after-delete hooks - indicators
+// automatically track position changes via byte-position markers in the editor.
+editor.on("after_file_open", "onGitGutterAfterFileOpen");
+editor.on("buffer_activated", "onGitGutterBufferActivated");
+editor.on("after_file_save", "onGitGutterAfterSave");
+editor.on("buffer_closed", "onGitGutterBufferClosed");
+
+// Register commands
+editor.registerCommand(
+  "Git Gutter: Refresh",
+  "Refresh git gutter indicators for the current buffer",
+  "git_gutter_refresh",
+  "normal"
+);
+
+// Initialize for the current buffer
+const initBufferId = editor.getActiveBufferId();
+const initPath = editor.getBufferPath(initBufferId);
+if (initPath && initPath !== "") {
+  bufferStates.set(initBufferId, {
+    filePath: initPath,
+    hunks: [],
+    updating: false,
+  });
+  updateGitGutter(initBufferId);
+}
+
+editor.debug("Git Gutter plugin loaded");
+editor.setStatus("Git Gutter plugin ready");

package/plugins/lib/fresh.d.ts

@@ -447,6 +447,26 @@ interface EditorAPI {
    * @returns true if virtual line was added
    */
   addVirtualLine(buffer_id: number, position: number, text: string, fg_r: number, fg_g: number, fg_b: number, bg_r: i16, bg_g: i16, bg_b: i16, above: boolean, namespace: string, priority: number): boolean;
+  /**
+   * Set a line indicator in the gutter's indicator column
+   * @param buffer_id - The buffer ID
+   * @param line - Line number (0-indexed)
+   * @param namespace - Namespace for grouping (e.g., "git-gutter", "breakpoints")
+   * @param symbol - Symbol to display (e.g., "│", "●", "★")
+   * @param r - Red color component (0-255)
+   * @param g - Green color component (0-255)
+   * @param b - Blue color component (0-255)
+   * @param priority - Priority for display when multiple indicators exist (higher wins)
+   * @returns true if indicator was set
+   */
+  setLineIndicator(buffer_id: number, line: number, namespace: string, symbol: string, r: number, g: number, b: number, priority: number): boolean;
+  /**
+   * Clear all line indicators for a specific namespace
+   * @param buffer_id - The buffer ID
+   * @param namespace - Namespace to clear (e.g., "git-gutter")
+   * @returns true if indicators were cleared
+   */
+  clearLineIndicators(buffer_id: number, namespace: string): boolean;
   /**
    * Submit a transformed view stream for a viewport
    * @param buffer_id - Buffer to apply the transform to