Fix #1320: generalize SPC *

Was formerly using ripgrep, and only ripgrep.
This commit is contained in:
Henrik Lissner 2019-04-10 20:14:50 -04:00
parent 3f751c1179
commit 3c01de8876
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 8 additions and 6 deletions

View file

@ -178,7 +178,7 @@ order.
return (intern (format format tool))))
;;;###autoload
(defun +helm/project-search (&optional arg)
(defun +helm/project-search (&optional arg query)
"Performs a project search from the project root.
Uses the first available search backend from `+helm-project-search-engines'. If
@ -187,10 +187,11 @@ ones, in the search."
(interactive "P")
(funcall (or (+helm--get-command "+helm/%s")
#'+helm/grep)
arg))
arg
query))
;;;###autoload
(defun +helm/project-search-from-cwd (&optional arg)
(defun +helm/project-search-from-cwd (&optional arg query)
"Performs a project search recursively from the current directory.
Uses the first available search backend from `+helm-project-search-engines'. If
@ -199,7 +200,8 @@ ones."
(interactive "P")
(funcall (or (+helm--get-command "+helm/%s-from-cwd")
#'+helm/grep-from-cwd)
arg))
arg
query))
;; Relative to project root

View file

@ -265,7 +265,7 @@ If prefix ARG is set, prompt for a known project to search from."
(user-error "There are no known projects"))
default-directory)))
(cond ((featurep! :completion ivy)
(+ivy/rg nil (rxt-quote-pcre symbol)))
(+ivy/project-search nil (rxt-quote-pcre symbol)))
((featurep! :completion helm)
(+helm/rg nil (rxt-quote-pcre symbol)))
(+helm/project-search nil (rxt-quote-pcre symbol)))
((rgrep (regexp-quote symbol))))))