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

fix(selectrum): Revert to jethro's version of file-search

Browse source 
Co-authored-by: jethrokuan <jethrokuan95@gmail.com>
This commit is contained in:
Edmund Miller 2021-02-23 22:12:10 -06:00 • committed by Itai Y. Efrat
parent 4fb1b7ed23
commit da75da3ab5
1 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/completion/selectrum/autoload/selectrum.el
View file

@ -23,7 +23,37 @@ one face."
(user-error "Couldn't find ripgrep in your PATH")) (user-error "Couldn't find ripgrep in your PATH"))
(require 'consult) (require 'consult)
(setq deactivate-mark t) (setq deactivate-mark t)
(consult-ripgrep)) (let* ((this-command 'consult--grep)
(project-root (or (doom-project-root) default-directory))
(directory (or in project-root))
(args (split-string
(string-trim
(concat (if all-files "-uu")
(unless recursive "--maxdepth 1")
"--null --line-buffered --color=always --max-columns=500 --no-heading --line-number"
" --hidden -g!.git "
(mapconcat #'shell-quote-argument args " ")))
" "))
(prompt (or prompt
(format "rg [%s]: "
(cond ((equal directory default-directory)
"./")
((equal directory project-root)
(projectile-project-name))
((file-relative-name directory project-root))))))
(query (or query
(when (doom-region-active-p)
(replace-regexp-in-string
"[! |]" (lambda (substr)
(cond ((and (string= substr " ")
(not (featurep! +fuzzy)))
" ")
((string= substr "|")
"\\\\\\\\|")
((concat "\\\\" substr))))
(rxt-quote-pcre (doom-thing-at-point-or-region))))))
(ripgrep-command `("rg" ,@args "." "-e")))
(consult--grep prompt ripgrep-command directory query)))
;;;###autoload ;;;###autoload
(defun +selectrum/project-search (&optional arg initial-query directory) (defun +selectrum/project-search (&optional arg initial-query directory)