mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-27 14:23:43 -05:00
refactor(vertico): move defadvice!'s to config.el
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:
@@ -1,28 +1,9 @@
|
||||
;;; 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
|
||||
;;;###autoload
|
||||
(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
|
||||
(cl-defun +vertico-file-search (&key query in all-files (recursive t) prompt args)
|
||||
"Conduct a file search using ripgrep.
|
||||
|
@@ -34,6 +34,14 @@ overrides `completion-styles' during company completion sessions.")
|
||||
(use-package! orderless
|
||||
:after-call doom-first-input-hook
|
||||
: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)
|
||||
(cond
|
||||
;; 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 #'multi-occur :override #'consult-multi-occur)
|
||||
: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
|
||||
consult-narrow-key "<"
|
||||
consult-line-numbers-widen t
|
||||
|
Reference in New Issue
Block a user