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

completion/selectrum -> completion/vertico, part 2

Browse source 
- Rename module from `:completion selectrum` to `:completion vertico`
- Rename all files involved
- Do *not* yet rename all the functions, as that messes up git's rename
  detection.
This commit is contained in:
Itai Y. Efrat 2021-07-09 20:16:11 +03:00
parent f9e1c99b2b
commit 24eaa1317c
33 changed files with 79 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/config/default/+emacs-bindings.el
View file

@ -54,7 +54,7 @@
(:when (featurep! :completion helm)
:desc "Jump to symbol in current workspace" "j" #'helm-lsp-workspace-symbol
:desc "Jump to symbol in any workspace" "J" #'helm-lsp-global-workspace-symbol)
(:when (featurep! :completion selectrum)
(:when (featurep! :completion vertico)
:desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols
:desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4)))
(:when (featurep! :ui treemacs +lsp)
@ -116,7 +116,7 @@
:desc "Search buffer" "b"
(cond ((featurep! :completion helm) #'swiper)
((featurep! :completion ivy) #'swiper)
((featurep! :completion selectrum) #'consult-line))
((featurep! :completion vertico) #'consult-line))
:desc "Search all open buffers" "B"
(cond ((featurep! :completion helm) #'swiper-all)
((featurep! :completion ivy) #'swiper-all))
@ -137,7 +137,7 @@
:desc "Search buffer for thing at point" "S"
(cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point)
((featurep! :completion ivy) #'swiper-isearch-thing-at-point)
((featurep! :completion selectrum) #'+selectrum/search-symbol-at-point))
((featurep! :completion vertico) #'+selectrum/search-symbol-at-point))
:desc "Dictionary" "t" #'+lookup/dictionary-definition
:desc "Thesaurus" "T" #'+lookup/synonyms)
@ -158,7 +158,7 @@
:desc "Bibliographic entries" "b"
(cond ((featurep! :completion ivy) #'ivy-bibtex)
((featurep! :completion helm) #'helm-bibtex)
((featurep! :completion selectrum) #'bibtex-actions-open-entry)))
((featurep! :completion vertico) #'bibtex-actions-open-entry)))
:desc "Toggle last org-clock" "c" #'+org/toggle-last-clock
:desc "Cancel current org-clock" "C" #'org-clock-cancel
@ -434,7 +434,7 @@
:desc "Send message" "s" #'+irc/send-message
(:when (featurep! :completion ivy)
:desc "Jump to channel" "j" #'+irc/ivy-jump-to-channel)
(:when (featurep! :completion selectrum)
(:when (featurep! :completion vertico)
:desc "Jump to channel" "j" #'+irc/selectrum-jump-to-channel)))
;;; <leader> T --- twitter
@ -463,7 +463,7 @@
(:when (featurep! :completion helm)
"C-S-s" #'swiper-helm
"C-S-r" #'helm-resume)
(:when (featurep! :completion selectrum)
(:when (featurep! :completion vertico)
"C-S-r" #'vertico-repeat)
;;; objed
@ -496,12 +496,12 @@
[C-tab] #'company-complete-common-or-cycle
[tab] #'company-complete-common-or-cycle
[backtab] #'company-select-previous
"C-RET" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point))
"C-<return>" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point))
"C-RET" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion vertico) #'completion-at-point))
"C-<return>" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion vertico) #'completion-at-point))
:map company-search-map
"C-n" #'company-search-repeat-forward
"C-p" #'company-search-repeat-backward

22
modules/config/default/+evil-bindings.el
View file

@ -138,9 +138,9 @@
"C-u" #'company-previous-page
"C-d" #'company-next-page
"C-s" #'company-filter-candidates
"C-S-s" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion selectrum) #'completion-at-point))
"C-S-s" (cond ((featurep! :completion helm) #'helm-company)
((featurep! :completion ivy) #'counsel-company)
((featurep! :completion vertico) #'completion-at-point))
"C-SPC" #'company-complete-common
"TAB" #'company-complete-common-or-cycle
[tab] #'company-complete-common-or-cycle
@ -203,7 +203,7 @@
(:after helm-grep :map helm-grep-map
[C-return] #'helm-grep-run-other-window-action))
(:when (featurep! :completion selectrum)
(:when (featurep! :completion vertico)
(:after vertico
:map vertico-map
"M-RET" #'vertico-exit-input
@ -306,7 +306,7 @@
:desc "Resume last search" "'"
(cond ((featurep! :completion ivy) #'ivy-resume)
((featurep! :completion helm) #'helm-resume)
((featurep! :completion selectrum) #'vertico-repeat))
((featurep! :completion vertico) #'vertico-repeat))
:desc "Search for symbol in project" "*" #'+default/search-project-for-symbol-at-point
:desc "Search project" "/" #'+default/search-project
@ -384,7 +384,7 @@
(:when (featurep! :completion helm)
:desc "Jump to symbol in current workspace" "j" #'helm-lsp-workspace-symbol
:desc "Jump to symbol in any workspace" "J" #'helm-lsp-global-workspace-symbol)
(:when (featurep! :completion selectrum)
(:when (featurep! :completion vertico)
:desc "Jump to symbol in current workspace" "j" #'consult-lsp-symbols
:desc "Jump to symbol in any workspace" "J" (cmd! #'consult-lsp-symbols '(4)))
(:when (featurep! :ui treemacs +lsp)
@ -516,9 +516,9 @@
:desc "Org agenda" "a" #'org-agenda
(:when (featurep! :tools biblio)
:desc "Bibliographic entries" "b"
(cond ((featurep! :completion ivy) #'ivy-bibtex)
((featurep! :completion helm) #'helm-bibtex)
((featurep! :completion selectrum) #'bibtex-actions-open-entry)))
(cond ((featurep! :completion ivy) #'ivy-bibtex)
((featurep! :completion helm) #'helm-bibtex)
((featurep! :completion vertico) #'bibtex-actions-open-entry)))
:desc "Toggle last org-clock" "c" #'+org/toggle-last-clock
:desc "Cancel current org-clock" "C" #'org-clock-cancel
@ -680,7 +680,7 @@
:desc "Search buffer" "b"
(cond ((featurep! :completion helm) #'swiper)
((featurep! :completion ivy) #'swiper)
((featurep! :completion selectrum) #'consult-line))
((featurep! :completion vertico) #'consult-line))
:desc "Search all open buffers" "B"
(cond ((featurep! :completion helm) #'swiper-all)
((featurep! :completion ivy) #'swiper-all))
@ -703,7 +703,7 @@
:desc "Search buffer for thing at point" "S"
(cond ((featurep! :completion helm) #'swiper-isearch-thing-at-point)
((featurep! :completion ivy) #'swiper-isearch-thing-at-point)
((featurep! :completion selectrum) #'+selectrum/search-symbol-at-point))
((featurep! :completion vertico) #'+selectrum/search-symbol-at-point))
:desc "Dictionary" "t" #'+lookup/dictionary-definition
:desc "Thesaurus" "T" #'+lookup/synonyms)

16
modules/config/default/autoload/search.el
View file

@ -10,9 +10,9 @@ If prefix ARG is set, prompt for a directory to search from."
(read-directory-name "Search directory: ")
default-directory)))
(call-interactively
(cond ((featurep! :completion ivy) #'+ivy/project-search-from-cwd)
((featurep! :completion helm) #'+helm/project-search-from-cwd)
((featurep! :completion selectrum) #'+selectrum/project-search-from-cwd)
(cond ((featurep! :completion ivy) #'+ivy/project-search-from-cwd)
((featurep! :completion helm) #'+helm/project-search-from-cwd)
((featurep! :completion vertico) #'+selectrum/project-search-from-cwd)
(#'rgrep)))))
;;;###autoload
@ -31,7 +31,7 @@ If a selection is active, pre-fill the prompt with it."
(if (region-active-p)
#'swiper-isearch-thing-at-point
#'swiper-isearch))
((featurep! :completion selectrum) #'isearch-forward))))
((featurep! :completion vertico) #'isearch-forward))))
;;;###autoload
(defun +default/search-project (&optional arg)
@ -48,9 +48,9 @@ If prefix ARG is set, include ignored/hidden files."
(user-error "There are no known projects"))
default-directory)))
(call-interactively
(cond ((featurep! :completion ivy) #'+ivy/project-search)
((featurep! :completion helm) #'+helm/project-search)
((featurep! :completion selectrum) #'+selectrum/project-search)
(cond ((featurep! :completion ivy) #'+ivy/project-search)
((featurep! :completion helm) #'+helm/project-search)
((featurep! :completion vertico) #'+selectrum/project-search)
(#'projectile-ripgrep)))))
;;;###autoload
@ -77,7 +77,7 @@ If prefix ARG is set, prompt for a known project to search from."
(+ivy/project-search nil symbol))
((featurep! :completion helm)
(+helm/project-search nil symbol))
((featurep! :completion selectrum)
((featurep! :completion vertico)
(+selectrum/project-search nil symbol))
((rgrep (regexp-quote symbol))))))

2
modules/config/default/autoload/text.el
View file

@ -30,7 +30,7 @@
(cond ((fboundp 'consult-yank-pop) #'consult-yank-pop) ;HACK see @ymarco's comment on #5013 and TODO.org in the selecturm module.
((fboundp 'counsel-yank-pop) #'counsel-yank-pop)
((fboundp 'helm-show-kill-ring) #'helm-show-kill-ring)
((error "No kill-ring search backend available. Enable ivy, helm or selectrum!")))))
((error "No kill-ring search backend available. Enable ivy, helm or vertico!")))))
;;;###autoload
(defun +default/yank-buffer-path (&optional root)

4
modules/config/default/config.el
View file

@ -402,12 +402,12 @@ Continues comments if executed from a commented line. Consults
"A-x" #'execute-extended-command)
;; A Doom convention where C-s on popups and interactive searches will invoke
;; ivy/helm/selectrum for their superior filtering.
;; ivy/helm/vertico for their superior filtering.
(when-let (command (cond ((featurep! :completion ivy)
#'counsel-minibuffer-history)
((featurep! :completion helm)
#'helm-minibuffer-history)
((featurep! :completion selectrum)
((featurep! :completion vertico)
#'consult-history)))
(define-key!
:keymaps (append +default-minibuffer-maps