From aed9d0b7e52efcb0ba02508352219400cc34a2ab Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 15 Sep 2021 17:42:08 +0200
Subject: [PATCH] fix: consult--grep call in load-path search commands

doom/help-search-load-path and doom/help-search-loaded-files were broken
by changes to consult--grep's interface upstream.

Ref 7762386e52b6
---
 core/autoload/help.el | 45 +++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/core/autoload/help.el b/core/autoload/help.el
index 016a5dc34..c548a4e24 100644
--- a/core/autoload/help.el
+++ b/core/autoload/help.el
@@ -724,20 +724,37 @@ config blocks in your private config."
   ;; REVIEW Replace with deadgrep
   (unless (executable-find "rg")
     (user-error "Can't find ripgrep on your system"))
-  (if (fboundp 'counsel-rg)
-      (let ((counsel-rg-base-command
-             (if (stringp counsel-rg-base-command)
-                 (format counsel-rg-base-command
-                         (concat "%s " (mapconcat #'shell-quote-argument dirs " ")))
-               (append counsel-rg-base-command dirs))))
-        (counsel-rg query nil "-Lz" prompt))
-    ;; TODO Add helm support?
-    (grep-find
-     (string-join
-      (append (list "rg" "-L" "--search-zip" "--no-heading" "--color=never"
-                    (shell-quote-argument query))
-              (mapcar #'shell-quote-argument dirs))
-      " "))))
+  (cond ((fboundp 'consult--grep)
+         (consult--grep
+          prompt
+          (lambda (input)
+            (pcase-let* ((cmd (split-string-and-unquote consult-ripgrep-args))
+                         (type (consult--ripgrep-regexp-type (car cmd)))
+                         (`(,arg . ,opts) (consult--command-split input))
+                         (`(,re . ,hl) (funcall consult--regexp-compiler arg type)))
+              (when re
+                (list :command
+                      (append cmd
+                              (and (eq type 'pcre) '("-P"))
+                              (list  "-e" (consult--join-regexps re type))
+                              opts
+                              dirs)
+                      :highlight hl))))
+          data-directory query))
+        ((fboundp 'counsel-rg)
+         (let ((counsel-rg-base-command
+                (if (stringp counsel-rg-base-command)
+                    (format counsel-rg-base-command
+                            (concat "%s " (mapconcat #'shell-quote-argument dirs " ")))
+                  (append counsel-rg-base-command dirs))))
+           (counsel-rg query nil "-Lz" (concat prompt ": "))))
+        ;; () TODO Helm support?
+        ((grep-find
+          (string-join
+           (append (list "rg" "-L" "--search-zip" "--no-heading" "--color=never"
+                         (shell-quote-argument query))
+                   (mapcar #'shell-quote-argument dirs))
+           " ")))))
 
 ;;;###autoload
 (defun doom/help-search-load-path (query)