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

Fix {git-,}grep backends for project search #1479

Browse source
This commit is contained in:
Henrik Lissner 2019-06-10 16:04:48 +02:00
parent 158e4cc97c
commit 750d7629e1
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/completion/ivy/autoload/ivy.el
View file

@ -351,25 +351,26 @@ order.
(let ((ivy-more-chars-alist (let ((ivy-more-chars-alist
(if query '((t . 1)) ivy-more-chars-alist))) (if query '((t . 1)) ivy-more-chars-alist)))
(pcase engine (pcase engine
('grep (`grep
(let ((args (if recursive " -R")) (let ((counsel-projectile-grep-initial-input query))
(counsel-projectile-grep-initial-input query)) (cl-letf (((symbol-function #'counsel-locate-git-root)
(if all-files (lambda () directory)))
(cl-letf (((symbol-function #'projectile-ignored-directories-rel) (if all-files
(symbol-function #'ignore)) (cl-letf (((symbol-function #'projectile-ignored-directories-rel)
((symbol-function #'projectile-ignored-files-rel) (symbol-function #'ignore))
(symbol-function #'ignore))) ((symbol-function #'projectile-ignored-files-rel)
(counsel-projectile-grep args)) (symbol-function #'ignore)))
(counsel-projectile-grep args)))) (counsel-projectile-grep))
('ag (counsel-projectile-grep)))))
(`ag
(let ((args (concat (if all-files " -a") (let ((args (concat (if all-files " -a")
(unless recursive " --depth 1")))) (unless recursive " --depth 1"))))
(counsel-ag query directory args (format prompt args)))) (counsel-ag query directory args (format prompt args))))
('rg (`rg
(let ((args (concat (if all-files " -uu") (let ((args (concat (if all-files " -uu")
(unless recursive " --maxdepth 1")))) (unless recursive " --maxdepth 1"))))
(counsel-rg query directory args (format prompt args)))) (counsel-rg query directory args (format prompt args))))
('pt (`pt
(let ((counsel-pt-base-command (let ((counsel-pt-base-command
(concat counsel-pt-base-command (concat counsel-pt-base-command
(if all-files " -U") (if all-files " -U")