From 4f088c3930ee8ee2ee58796f0634d90b76b50526 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sat, 20 Jun 2026 12:50:40 -0400
Subject: refactor(prog-general): dedup the deadgrep search tail, lift its
 helpers

cj/deadgrep-here and cj/deadgrep-in-dir repeated the same normalize-directory + read-term + invoke-deadgrep tail. Lift cj/deadgrep--initial-term out of :config and add cj/--deadgrep-run for the shared tail; each command resolves its root then delegates. Adds coverage for the term seeding and the run helper.
---
 modules/prog-general.el | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'modules')

diff --git a/modules/prog-general.el b/modules/prog-general.el
index ae48bc9cb..968032831 100644
--- a/modules/prog-general.el
+++ b/modules/prog-general.el
@@ -232,6 +232,23 @@ If no such file exists there, display a message."
 
 ;; ---------------------------------- Ripgrep ----------------------------------
 
+(declare-function deadgrep "deadgrep")
+
+(defun cj/deadgrep--initial-term ()
+  "Return the region text or the symbol at point, to seed a Deadgrep search."
+  (cond
+   ((use-region-p)
+    (buffer-substring-no-properties (region-beginning) (region-end)))
+   (t (thing-at-point 'symbol t))))
+
+(defun cj/--deadgrep-run (root &optional term)
+  "Run Deadgrep for TERM under directory ROOT.
+ROOT is normalized to a directory name; TERM defaults to a minibuffer read
+seeded by `cj/deadgrep--initial-term'.  Shared tail of the deadgrep commands."
+  (let ((root (file-name-as-directory (expand-file-name root)))
+        (term (or term (read-from-minibuffer "Search: " (cj/deadgrep--initial-term)))))
+    (deadgrep term root)))
+
 (use-package deadgrep
   :after projectile
   :bind
@@ -242,12 +259,6 @@ If no such file exists there, display a message."
   :config
   (require 'thingatpt)
 
-  (defun cj/deadgrep--initial-term ()
-	(cond
-	 ((use-region-p)
-	  (buffer-substring-no-properties (region-beginning) (region-end)))
-	 (t (thing-at-point 'symbol t))))
-
   (defun cj/deadgrep-here (&optional term)
 	"Search with Deadgrep in the most relevant directory at point."
 	(interactive)
@@ -264,17 +275,14 @@ If no such file exists there, display a message."
 			 (buffer-file-name
 			  (file-name-directory (file-truename buffer-file-name)))
 			 (t default-directory)))
-		   (root (file-name-as-directory (expand-file-name root)))
-		   (term (or term (read-from-minibuffer "Search: " (cj/deadgrep--initial-term)))))
-	  (deadgrep term root)))
+		   )
+	  (cj/--deadgrep-run root term)))
 
   (defun cj/deadgrep-in-dir (&optional dir term)
     "Prompt for a directory, then search there with Deadgrep."
     (interactive)
-	(let* ((dir (or dir (read-directory-name "Search in directory: " default-directory nil t)))
-		   (dir (file-name-as-directory (expand-file-name dir)))
-		   (term (or term (read-from-minibuffer "Search: " (cj/deadgrep--initial-term)))))
-	  (deadgrep term dir))))
+	(let ((dir (or dir (read-directory-name "Search in directory: " default-directory nil t))))
+	  (cj/--deadgrep-run dir term))))
 
 (with-eval-after-load 'dired
   (keymap-set dired-mode-map "G" #'cj/deadgrep-here))
-- 
cgit v1.2.3