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

refactor(vertico): move defadvice!'s to config.el

Browse source 
The vast majority of Doom modules have their defadvice! statements in
their config.el files, and not their autoloads. Since these don't need
to be autoloaded to function, we move them for better consistency.
This commit is contained in:
Itai Y. Efrat 2021-10-17 14:12:41 +03:00
parent b66aaf9e9f
commit 6e629c1c53
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/completion/vertico/autoload/vertico.el
View file

@ -1,28 +1,9 @@
;;; completion/vertico/autoload/vertico.el -*- lexical-binding: t; -*- ;;; completion/vertico/autoload/vertico.el -*- lexical-binding: t; -*-
;; To prevent "Unused lexical variable" warning from +vertico--company-capf--candidates-a
;;;###autoload
(defvar orderless-match-faces)
;; To prevent "Defining as dynamic an already lexical var" from +vertico/embark-preview ;; To prevent "Defining as dynamic an already lexical var" from +vertico/embark-preview
;;;###autoload ;;;###autoload
(defvar embark-quit-after-action) (defvar embark-quit-after-action)
;;;###autoload
(defadvice! +vertico--company-capf--candidates-a (fn &rest args)
"Highlight company matches correctly, and try default completion styles before
orderless."
:around #'company-capf--candidates
(let ((orderless-match-faces [completions-common-part])
(completion-styles +vertico-company-completion-styles))
(apply fn args)))
;;;###autoload
(defadvice! +vertico--consult-recent-file-a (&rest _args)
"`consult-recent-file' needs to have `recentf-mode' on to work correctly"
:before #'consult-recent-file
(recentf-mode +1))
;;;###autoload ;;;###autoload
(cl-defun +vertico-file-search (&key query in all-files (recursive t) prompt args) (cl-defun +vertico-file-search (&key query in all-files (recursive t) prompt args)
"Conduct a file search using ripgrep. "Conduct a file search using ripgrep.

13
modules/completion/vertico/config.el
View file

@ -34,6 +34,14 @@ overrides `completion-styles' during company completion sessions.")
(use-package! orderless (use-package! orderless
:after-call doom-first-input-hook :after-call doom-first-input-hook
:config :config
(defadvice! +vertico--company-capf--candidates-a (fn &rest args)
"Highlight company matches correctly, and try default completion styles before
orderless."
:around #'company-capf--candidates
(let ((orderless-match-faces [completions-common-part])
(completion-styles +vertico-company-completion-styles))
(apply fn args)))
(defun +vertico-orderless-dispatch (pattern _index _total) (defun +vertico-orderless-dispatch (pattern _index _total)
(cond (cond
;; Ensure $ works with Consult commands, which add disambiguation suffixes ;; Ensure $ works with Consult commands, which add disambiguation suffixes
@ -94,6 +102,11 @@ overrides `completion-styles' during company completion sessions.")
(advice-add #'completing-read-multiple :override #'consult-completing-read-multiple) (advice-add #'completing-read-multiple :override #'consult-completing-read-multiple)
(advice-add #'multi-occur :override #'consult-multi-occur) (advice-add #'multi-occur :override #'consult-multi-occur)
:config :config
(defadvice! +vertico--consult-recent-file-a (&rest _args)
"`consult-recent-file' needs to have `recentf-mode' on to work correctly"
:before #'consult-recent-file
(recentf-mode +1))
(setq consult-project-root-function #'doom-project-root (setq consult-project-root-function #'doom-project-root
consult-narrow-key "<" consult-narrow-key "<"
consult-line-numbers-widen t consult-line-numbers-widen t