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

completion/ivy: rewrite file search (:find => :ag/:rg)

Browse source
This commit is contained in:
Henrik Lissner 2017-05-12 11:50:05 +02:00
parent 195609d89d
commit 877ae26a96
4 changed files with 119 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,40 +1,5 @@
;;; completion/ivy/autoload/evil.el
(defvar +ivy--file-last-search nil)
;;;###autoload (autoload '+ivy:file-search "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:file-search (beg end query all-files-p &optional dir)
"Preform a `counsel-rg' search with QUERY. If QUERY is nil and in visual mode,
use the selection, otherwise activate live rg searching in ivy.
If ALL-FILES-P is non-nil, don't respect .gitignore files and search everything.
If there is no selection and QUERY is empty, then relaunch the previous search
session."
:type inclusive :repeat nil
(interactive "<r><a><!>")
(let ((query (or query
(and (evil-visual-state-p)
(and beg end
(rxt-quote-pcre (buffer-substring-no-properties beg end))))
+ivy--file-last-search))
;; smart-case instead of case-insensitive flag
(counsel-rg-base-command
(replace-regexp-in-string " -i " " -S " counsel-rg-base-command)))
(setq +ivy--file-last-search query)
(counsel-rg query
(or dir (doom-project-root))
(when all-files-p " -u")
(format "File search%s" (if all-files-p " (all)" "")))))
;;;###autoload (autoload '+ivy:file-search-cwd "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:file-search-cwd (beg end search all-files-p)
"Perform a `counsel-rg' search for SEARCH (or the current selection) in
`default-directory'."
:type inclusive :repeat nil
(interactive "<r><a><!>")
(+ivy:file-search beg end search all-files-p default-directory))
;;;###autoload (autoload '+ivy:swiper "completion/ivy/autoload/evil" nil t)
(evil-define-command +ivy:swiper (&optional search)
"Invoke `swiper' with SEARCH, otherwise with the symbol at point."
@ -46,3 +11,87 @@ session."
"An ex wrapper around `+ivy/tasks'."
(interactive "<!>")
(+ivy/tasks bang))
;; --- file searching ---------------------
(defvar +ivy--file-last-search nil)
(defvar +ivy--file-search-recursion-p t)
(defvar +ivy--file-search-all-files-p nil)
(defun +ivy--file-search (engine beg end query &optional directory prompt)
(let* ((directory (or directory (doom-project-root)))
(recursion-p +ivy--file-search-recursion-p)
(all-files-p +ivy--file-search-all-files-p)
(project-root (doom-project-root))
(query
(or query
(and (evil-visual-state-p)
beg end
(rxt-quote-pcre (buffer-substring-no-properties beg end)))
+ivy--file-last-search))
(prompt
(format "%s%%s %s"
(symbol-name engine)
(cond ((equal directory default-directory)
"./")
((equal directory project-root)
(projectile-project-name))
(t
(file-relative-name directory project-root))))))
(setq +ivy--file-last-search query)
(cond ((eq engine 'ag)
(let ((args (concat
(if all-files-p " -a")
(unless recursion-p " -n"))))
(counsel-ag query directory args (format prompt args))))
((eq engine '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 0"))))
(counsel-rg query directory args (format prompt args))))
((eq engine 'pt)) ; TODO pt search engine (necessary?)
(t (error "No search engine specified")))))
;;;###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
regexp. If omitted, will perform the last known search.
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 'ag beg end query directory)))
;;;###autoload (autoload '+ivy:rg "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:rg (beg end query &optional all-files-p directory)
"Perform a project file search using ripgrep. QUERY is a regexp. If omitted,
will perform the last known search.
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 'rg beg end query directory)))
;;;###autoload (autoload '+ivy:ag-cwd "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:ag-cwd (beg end query &optional inhibit-recursion-p)
"The same as :ag, but only searches the current directory. If
INHIBIT-RECURSION-P, don't recurse into sub-directories."
(interactive "<r><a><!>")
(let ((+ivy--file-search-recursion-p (not inhibit-recursion-p)))
(+ivy:ag beg end query t default-directory)))
;;;###autoload (autoload '+ivy:rg-cwd "completion/ivy/autoload/evil" nil t)
(evil-define-operator +ivy:rg-cwd (beg end query &optional inhibit-recursion-p)
"The same as :rg, but only searches the current directory. If
INHIBIT-RECURSION-P, don't recurse into sub-directories."
(interactive "<r><a><!>")
(let ((+ivy--file-search-recursion-p (not inhibit-recursion-p)))
(+ivy:rg beg end query t default-directory)))