emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: consult--grep call in load-path search commands

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

Ref 7762386e52
This commit is contained in:
Henrik Lissner 2021-09-15 17:42:08 +02:00
parent 65b2712001
commit aed9d0b7e5
1 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
core/autoload/help.el
View file

@ -724,20 +724,37 @@ config blocks in your private config."
;; REVIEW Replace with deadgrep ;; REVIEW Replace with deadgrep
(unless (executable-find "rg") (unless (executable-find "rg")
(user-error "Can't find ripgrep on your system")) (user-error "Can't find ripgrep on your system"))
(if (fboundp 'counsel-rg) (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 (let ((counsel-rg-base-command
(if (stringp counsel-rg-base-command) (if (stringp counsel-rg-base-command)
(format counsel-rg-base-command (format counsel-rg-base-command
(concat "%s " (mapconcat #'shell-quote-argument dirs " "))) (concat "%s " (mapconcat #'shell-quote-argument dirs " ")))
(append counsel-rg-base-command dirs)))) (append counsel-rg-base-command dirs))))
(counsel-rg query nil "-Lz" prompt)) (counsel-rg query nil "-Lz" (concat prompt ": "))))
;; TODO Add helm support? ;; () TODO Helm support?
(grep-find ((grep-find
(string-join (string-join
(append (list "rg" "-L" "--search-zip" "--no-heading" "--color=never" (append (list "rg" "-L" "--search-zip" "--no-heading" "--color=never"
(shell-quote-argument query)) (shell-quote-argument query))
(mapcar #'shell-quote-argument dirs)) (mapcar #'shell-quote-argument dirs))
" ")))) " ")))))
;;;###autoload ;;;###autoload
(defun doom/help-search-load-path (query) (defun doom/help-search-load-path (query)