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

Fix #1320: generalize SPC *

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
modules/completion/helm/autoload/helm.el
View file

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

4
modules/config/default/autoload/default.el
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")) (user-error "There are no known projects"))
default-directory))) default-directory)))
(cond ((featurep! :completion ivy) (cond ((featurep! :completion ivy)
(+ivy/rg nil (rxt-quote-pcre symbol))) (+ivy/project-search nil (rxt-quote-pcre symbol)))
((featurep! :completion helm) ((featurep! :completion helm)
(+helm/rg nil (rxt-quote-pcre symbol))) (+helm/project-search nil (rxt-quote-pcre symbol)))
((rgrep (regexp-quote symbol)))))) ((rgrep (regexp-quote symbol))))))