@fresh-editor/fresh-editor 0.1.75 → 0.1.77

package/plugins/git_grep.ts

@@ -1,13 +1,17 @@
-/// <reference path="../types/fresh.d.ts" />
-const editor = getEditor();
-
+/// <reference path="./lib/fresh.d.ts" />
 
 /**
  * Git Grep Plugin
  *
- * Provides interactive git grep functionality with live search results.
+ * Provides interactive git grep functionality with live search results
+ * and preview panel. Uses the Finder abstraction for unified search UX.
  */
 
+import { Finder, parseGrepOutput } from "./lib/finder.ts";
+
+const editor = getEditor();
+
+// Result type from git grep
 interface GrepMatch {
   file: string;
   line: number;
@@ -15,177 +19,56 @@ interface GrepMatch {
   content: string;
 }
 
-// State management
-let gitGrepResults: GrepMatch[] = [];
-
-// Parse git grep output line
-// Format: file:line:column:content
-function parseGitGrepLine(line: string): GrepMatch | null {
-  const match = line.match(/^([^:]+):(\d+):(\d+):(.*)$/);
-  if (match) {
-    return {
-      file: match[1],
-      line: parseInt(match[2], 10),
-      column: parseInt(match[3], 10),
-      content: match[4].trimStart(),
-    };
-  }
-  return null;
-}
-
-// Parse git grep output into suggestions
-function parseGitGrepOutput(stdout: string): {
-  results: GrepMatch[];
-  suggestions: PromptSuggestion[];
-} {
-  const results: GrepMatch[] = [];
-  const suggestions: PromptSuggestion[] = [];
-
-  for (const line of stdout.split("\n")) {
-    if (!line.trim()) continue;
-    const match = parseGitGrepLine(line);
-    if (match) {
-      results.push(match);
-      suggestions.push({
-        text: `${match.file}:${match.line}:${match.column}`,
-        description: match.content,
-        value: `${match.file}:${match.line}:${match.column}`,
-        disabled: false,
-      });
-
-      // Limit to 100 results for performance
-      if (results.length >= 100) {
-        break;
-      }
-    }
-  }
-
-  return { results, suggestions };
-}
-
-// Global function to start git grep
-globalThis.start_git_grep = function(): void {
-  // Clear previous results
-  gitGrepResults = [];
-
-  // Start the prompt
-  editor.startPrompt(editor.t("prompt.grep"), "git-grep");
-  editor.setStatus(editor.t("status.type_to_search"));
-};
-
-// React to prompt input changes
-globalThis.onGitGrepPromptChanged = function(args: {
-  prompt_type: string;
-  input: string;
-}): boolean {
-  if (args.prompt_type !== "git-grep") {
-    return true; // Not our prompt
-  }
-
-  const query = args.input;
-
-  // Don't search for empty queries
-  if (!query || query.trim() === "") {
-    editor.setPromptSuggestions([]);
-    return true;
-  }
-
-  // Spawn git grep asynchronously
+// Create the finder instance
+const finder = new Finder<GrepMatch>(editor, {
+  id: "git-grep",
+  format: (match) => ({
+    label: `${match.file}:${match.line}`,
+    description:
+      match.content.length > 60
+        ? match.content.substring(0, 57).trim() + "..."
+        : match.content.trim(),
+    location: {
+      file: match.file,
+      line: match.line,
+      column: match.column,
+    },
+  }),
+  preview: true,
+  maxResults: 100,
+});
+
+// Search function using git grep
+async function searchWithGitGrep(query: string): Promise<GrepMatch[]> {
   const cwd = editor.getCwd();
-  editor.spawnProcess("git", ["grep", "-n", "--column", "-I", "--", query], cwd)
-    .then((result) => {
-      if (result.exit_code === 0) {
-        // Parse results and update suggestions
-        const { results, suggestions } = parseGitGrepOutput(result.stdout);
-        gitGrepResults = results;
-
-        // Update prompt with suggestions
-        editor.setPromptSuggestions(suggestions);
-
-        // Update status
-        if (results.length > 0) {
-          editor.setStatus(editor.t("status.found", { count: String(results.length) }));
-        } else {
-          editor.setStatus(editor.t("status.no_matches"));
-        }
-      } else if (result.exit_code === 1) {
-        // No matches found (git grep returns 1)
-        gitGrepResults = [];
-        editor.setPromptSuggestions([]);
-        editor.setStatus(editor.t("status.no_matches"));
-      } else {
-        // Error occurred
-        editor.setStatus(editor.t("status.error", { error: result.stderr }));
-      }
-    })
-    .catch((e) => {
-      editor.setStatus(editor.t("status.error", { error: String(e) }));
-    });
-
-  return true;
-};
-
-// Handle prompt confirmation (user pressed Enter)
-globalThis.onGitGrepPromptConfirmed = function(args: {
-  prompt_type: string;
-  selected_index: number | null;
-  input: string;
-}): boolean {
-  if (args.prompt_type !== "git-grep") {
-    return true; // Not our prompt
-  }
-
-  editor.debug(
-    `prompt-confirmed: selected_index=${args.selected_index}, num_results=${gitGrepResults.length}`
+  const result = await editor.spawnProcess(
+    "git",
+    ["grep", "-n", "--column", "-I", "--", query],
+    cwd
   );
 
-  // Check if user selected a suggestion
-  if (args.selected_index !== null && gitGrepResults[args.selected_index]) {
-    const selected = gitGrepResults[args.selected_index];
-
-    editor.debug(`Opening file: ${selected.file}:${selected.line}:${selected.column}`);
-
-    // Open the file at the specific location
-    editor.openFile(selected.file, selected.line, selected.column);
-    editor.setStatus(editor.t("status.opened", { location: `${selected.file}:${selected.line}:${selected.column}` }));
-  } else {
-    // No selection
-    editor.debug("No file selected - selected_index is null or out of bounds");
-    editor.setStatus(editor.t("status.no_selection"));
-  }
-
-  return true;
-};
-
-// Handle prompt cancellation (user pressed Escape)
-globalThis.onGitGrepPromptCancelled = function(args: {
-  prompt_type: string;
-}): boolean {
-  if (args.prompt_type !== "git-grep") {
-    return true; // Not our prompt
+  if (result.exit_code === 0) {
+    return parseGrepOutput(result.stdout, 100) as GrepMatch[];
   }
+  return [];
+}
 
-  // Clear results
-  gitGrepResults = [];
-  editor.setStatus(editor.t("status.cancelled"));
-
-  return true;
+// Global function to start git grep
+globalThis.start_git_grep = function (): void {
+  finder.prompt({
+    title: editor.t("prompt.grep"),
+    source: {
+      mode: "search",
+      search: searchWithGitGrep,
+      debounceMs: 150,
+      minQueryLength: 1,
+    },
+  });
 };
 
-// Register event handlers
-editor.on("prompt_changed", "onGitGrepPromptChanged");
-editor.on("prompt_confirmed", "onGitGrepPromptConfirmed");
-editor.on("prompt_cancelled", "onGitGrepPromptCancelled");
-
 // Register command
-editor.registerCommand(
-  "%cmd.grep",
-  "%cmd.grep_desc",
-  "start_git_grep",
-  "normal"
-);
+editor.registerCommand("%cmd.grep", "%cmd.grep_desc", "start_git_grep", "normal");
 
 // Log that plugin loaded successfully
-editor.debug("Git Grep plugin loaded successfully (TypeScript)");
-editor.debug("Usage: Call start_git_grep() or use command palette 'Git Grep'");
+editor.debug("Git Grep plugin loaded (using Finder abstraction)");
 editor.setStatus(editor.t("status.ready"));

package/plugins/git_gutter.ts

@@ -1,4 +1,4 @@
-/// <reference path="../types/fresh.d.ts" />
+/// <reference path="./lib/fresh.d.ts" />
 const editor = getEditor();
 
 

package/plugins/git_log.ts

@@ -1,4 +1,4 @@
-/// <reference path="../types/fresh.d.ts" />
+/// <reference path="./lib/fresh.d.ts" />
 const editor = getEditor();
 
 
@@ -932,16 +932,9 @@ globalThis.git_log_copy_hash = function(): void {
     return;
   }
 
-  // Use spawn to copy to clipboard (works on most systems)
-  // Try xclip first (Linux), then pbcopy (macOS), then xsel
-  editor.spawnProcess("sh", ["-c", `echo -n "${commit.hash}" | xclip -selection clipboard 2>/dev/null || echo -n "${commit.hash}" | pbcopy 2>/dev/null || echo -n "${commit.hash}" | xsel --clipboard 2>/dev/null`])
-    .then(() => {
-      editor.setStatus(editor.t("status.hash_copied", { short: commit.shortHash, full: commit.hash }));
-    })
-    .catch(() => {
-      // If all clipboard commands fail, just show the hash
-      editor.setStatus(editor.t("status.hash_display", { hash: commit.hash }));
-    });
+  // Copy hash to clipboard
+  editor.copyToClipboard(commit.hash);
+  editor.setStatus(editor.t("status.hash_copied", { short: commit.shortHash, full: commit.hash }));
 };
 
 // =============================================================================