From 750d7629e14e1320bd8857b3b1aab97d98e9dc89 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 10 Jun 2019 16:04:48 +0200 Subject: [PATCH] Fix {git-,}grep backends for project search #1479 --- modules/completion/ivy/autoload/ivy.el | 27 +++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/modules/completion/ivy/autoload/ivy.el b/modules/completion/ivy/autoload/ivy.el index 3810a8df2..64ef7402b 100644 --- a/modules/completion/ivy/autoload/ivy.el +++ b/modules/completion/ivy/autoload/ivy.el @@ -351,25 +351,26 @@ order. (let ((ivy-more-chars-alist (if query '((t . 1)) ivy-more-chars-alist))) (pcase engine - ('grep - (let ((args (if recursive " -R")) - (counsel-projectile-grep-initial-input query)) - (if all-files - (cl-letf (((symbol-function #'projectile-ignored-directories-rel) - (symbol-function #'ignore)) - ((symbol-function #'projectile-ignored-files-rel) - (symbol-function #'ignore))) - (counsel-projectile-grep args)) - (counsel-projectile-grep args)))) - ('ag + (`grep + (let ((counsel-projectile-grep-initial-input query)) + (cl-letf (((symbol-function #'counsel-locate-git-root) + (lambda () directory))) + (if all-files + (cl-letf (((symbol-function #'projectile-ignored-directories-rel) + (symbol-function #'ignore)) + ((symbol-function #'projectile-ignored-files-rel) + (symbol-function #'ignore))) + (counsel-projectile-grep)) + (counsel-projectile-grep))))) + (`ag (let ((args (concat (if all-files " -a") (unless recursive " --depth 1")))) (counsel-ag query directory args (format prompt args)))) - ('rg + (`rg (let ((args (concat (if all-files " -uu") (unless recursive " --maxdepth 1")))) (counsel-rg query directory args (format prompt args)))) - ('pt + (`pt (let ((counsel-pt-base-command (concat counsel-pt-base-command (if all-files " -U")