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

completion/ivy: refactor ag/rg file search backends + fix args

Browse source
This commit is contained in:
Henrik Lissner 2018-02-19 20:18:25 -05:00
parent 04cb9a2691
commit 3bc9f4b4fb
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/completion/ivy/autoload/evil.el
View file

@ -51,7 +51,8 @@
(pcase engine
('grep
(let ((args (if recursion-p " -r"))
(counsel-projectile-grep-initial-input query))
(counsel-projectile-grep-initial-input query)
(default-directory directory))
(if all-files-p
(cl-letf (((symbol-function #'projectile-ignored-directories-rel)
(symbol-function #'ignore))
@ -60,17 +61,14 @@
(counsel-projectile-grep args))
(counsel-projectile-grep args))))
('ag
(let ((args (concat
(if all-files-p " -a")
(unless recursion-p " -n"))))
(let ((args (concat " -S" ; smart-case
(if all-files-p " -a")
(unless recursion-p " --depth 1"))))
(counsel-ag query directory args (format prompt args))))
('rg
;; smart-case instead of case-insensitive flag
(let ((counsel-rg-base-command
(replace-regexp-in-string " -i " " -S " counsel-rg-base-command))
(args (concat
(if all-files-p " -uu")
(unless recursion-p " --maxdepth 1"))))
(let ((args (concat " -S" ; smart-case
(if all-files-p " -uu")
(unless recursion-p " --maxdepth 1"))))
(counsel-rg query directory args (format prompt args))))
('pt) ;; TODO pt search engine (necessary?)
(_ (error "No search engine specified")))))
@ -88,7 +86,7 @@ If ALL-FILES-P, don't respect .gitignore files and search everything."
;;;###autoload (autoload '+ivy:ag "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:ag (beg end query &optional all-files-p directory)
"Perform a project file search using the silver search. QUERY is a pcre
"Perform a project file search using the silver searcher. QUERY is a pcre
regexp. If omitted, the current selection is used. If no selection is active,
the last known search is used.