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

completion/ivy: add pt file search backend; fix +ivy:grep-cwd autoload

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

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

@ -70,9 +70,27 @@
(if all-files-p " -uu") (if all-files-p " -uu")
(unless recursion-p " --maxdepth 1")))) (unless recursion-p " --maxdepth 1"))))
(counsel-rg query directory args (format prompt args)))) (counsel-rg query directory args (format prompt args))))
('pt) ;; TODO pt search engine (necessary?) ('pt
(let ((counsel-pt-base-command
(concat counsel-pt-base-command
" -S" ; smart-case
(if all-files-p " -U")
(unless recursion-p " --depth=1")))
(default-directory directory))
(counsel-pt query)))
(_ (error "No search engine specified"))))) (_ (error "No search engine specified")))))
;;;###autoload (autoload '+ivy:pt "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:pt (beg end query &optional all-files-p directory)
"Perform a project file search using the platinum searcher. QUERY is a grep
regexp. If omitted, the current selection is used. If no selection is active,
the last known search is used.
If ALL-FILES-P, don't respect .gitignore files and search everything."
(interactive "<r><a><!>")
(let ((+ivy--file-search-all-files-p all-files-p))
(+ivy--file-search 'pt beg end query directory)))
;;;###autoload (autoload '+ivy:grep "completion/ivy/autoload/evil" nil t) ;;;###autoload (autoload '+ivy:grep "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:grep (beg end query &optional all-files-p directory) (evil-define-operator +ivy:grep (beg end query &optional all-files-p directory)
"Perform a project file search using grep (or git-grep in git repos). QUERY is "Perform a project file search using grep (or git-grep in git repos). QUERY is
@ -109,9 +127,17 @@ NOTE: ripgrep doesn't support multiline searches (yet)."
(+ivy--file-search 'rg beg end query directory))) (+ivy--file-search 'rg beg end query directory)))
;;;###autoload (autoload '+ivy:ag-cwd "completion/ivy/autoload/evil" nil t) ;;;###autoload (autoload '+ivy:pt-cwd "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:pt-cwd (beg end query &optional bang)
"The same as :grep, but searches the current directory. If BANG, don't recurse
into sub-directories."
(interactive "<r><a><!>")
(let ((+ivy--file-search-recursion-p (not bang)))
(+ivy:pt beg end query t default-directory)))
;;;###autoload (autoload '+ivy:grep-cwd "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:grep-cwd (beg end query &optional bang) (evil-define-operator +ivy:grep-cwd (beg end query &optional bang)
"The same as :git, but searches the current directory. If BANG, don't recurse "The same as :grep, but searches the current directory. If BANG, don't recurse
into sub-directories." into sub-directories."
(interactive "<r><a><!>") (interactive "<r><a><!>")
(let ((+ivy--file-search-recursion-p (not bang))) (let ((+ivy--file-search-recursion-p (not bang)))