completion/ivy: refactor for consistency

This commit is contained in:
Henrik Lissner 2017-05-10 08:38:32 +02:00
parent bfd79e78ce
commit 2a6295a123

View file

@ -5,7 +5,7 @@
"An alist of tags for `+ivy/tasks' to include in its search, whose CDR is the "An alist of tags for `+ivy/tasks' to include in its search, whose CDR is the
face to render it with.") face to render it with.")
(defmacro ivy-do-action! (action) (defmacro +ivy-do-action! (action)
"A factory function that returns an interactive lamba that sets the current "A factory function that returns an interactive lamba that sets the current
ivy action and immediately runs it on the current candidate (ending the ivy ivy action and immediately runs it on the current candidate (ending the ivy
session)." session)."
@ -99,12 +99,9 @@ session)."
(map! :map counsel-ag-map ; applies to counsel-rg too (map! :map counsel-ag-map ; applies to counsel-rg too
[backtab] #'+ivy/wgrep-occur ; search/replace on results [backtab] #'+ivy/wgrep-occur ; search/replace on results
"C-SPC" #'counsel-git-grep-recenter ; preview "C-SPC" #'counsel-git-grep-recenter ; preview
"M-RET" (ivy-do-action! #'+ivy-git-grep-other-window-action)) "M-RET" (+ivy-do-action! #'+ivy-git-grep-other-window-action))
;; 1) Gets rid of the character limit from `counsel-ag-function' and ;; NOTE Both counsel-rg and counsel-ag use this function
;; 2) Disables ivy's over-zealous parentheses quoting behavior
;;
;; These both interfere with my custom :[ar]g ex command `+ivy:file-search'.
(advice-add #'counsel-ag-function :override #'+ivy*counsel-ag-function)) (advice-add #'counsel-ag-function :override #'+ivy*counsel-ag-function))