updating config and corfu module
This commit is contained in:
parent
8bd123ef11
commit
b59a7f8cf8
8 changed files with 224 additions and 298 deletions
|
|
@ -1,9 +1,64 @@
|
|||
;;; completion/corfu/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +corfu-completion-styles '(basic partial-completion flex)
|
||||
"Completion styles for corfu to use.
|
||||
|
||||
If the user enables +orderless, `orderless' is automatically appended to this
|
||||
list before fowarding to `completion-styles'.")
|
||||
|
||||
(defvar +corfu-icon-mapping
|
||||
`((array ,(nerd-icons-codicon "nf-cod-symbol_array") :face font-lock-type-face)
|
||||
(boolean ,(nerd-icons-codicon "nf-cod-symbol_boolean") :face font-lock-builtin-face)
|
||||
(class ,(nerd-icons-codicon "nf-cod-symbol_class") :face font-lock-type-face)
|
||||
(color ,(nerd-icons-codicon "nf-cod-symbol_color") :face success)
|
||||
(command ,(nerd-icons-codicon "nf-cod-terminal") :face default)
|
||||
(constant ,(nerd-icons-codicon "nf-cod-symbol_constant") :face font-lock-constant-face)
|
||||
(constructor ,(nerd-icons-codicon "nf-cod-triangle_right") :face font-lock-function-name-face)
|
||||
(enummember ,(nerd-icons-codicon "nf-cod-symbol_enum_member") :face font-lock-builtin-face)
|
||||
(enum-member ,(nerd-icons-codicon "nf-cod-symbol_enum_member") :face font-lock-builtin-face)
|
||||
(enum ,(nerd-icons-codicon "nf-cod-symbol_enum") :face font-lock-builtin-face)
|
||||
(event ,(nerd-icons-codicon "nf-cod-symbol_event") :face font-lock-warning-face)
|
||||
(field ,(nerd-icons-codicon "nf-cod-symbol_field") :face font-lock-variable-name-face)
|
||||
(file ,(nerd-icons-codicon "nf-cod-symbol_file") :face font-lock-string-face)
|
||||
(folder ,(nerd-icons-codicon "nf-cod-folder") :face font-lock-doc-face)
|
||||
(interface ,(nerd-icons-codicon "nf-cod-symbol_interface") :face font-lock-type-face)
|
||||
(keyword ,(nerd-icons-codicon "nf-cod-symbol_keyword") :face font-lock-keyword-face)
|
||||
(macro ,(nerd-icons-codicon "nf-cod-symbol_misc") :face font-lock-keyword-face)
|
||||
(magic ,(nerd-icons-codicon "nf-cod-wand") :face font-lock-builtin-face)
|
||||
(method ,(nerd-icons-codicon "nf-cod-symbol_method") :face font-lock-function-name-face)
|
||||
(function ,(nerd-icons-codicon "nf-cod-symbol_method") :face font-lock-function-name-face)
|
||||
(module ,(nerd-icons-codicon "nf-cod-file_submodule") :face font-lock-preprocessor-face)
|
||||
(numeric ,(nerd-icons-codicon "nf-cod-symbol_numeric") :face font-lock-builtin-face)
|
||||
(operator ,(nerd-icons-codicon "nf-cod-symbol_operator") :face font-lock-comment-delimiter-face)
|
||||
(param ,(nerd-icons-codicon "nf-cod-symbol_parameter") :face default)
|
||||
(property ,(nerd-icons-codicon "nf-cod-symbol_property") :face font-lock-variable-name-face)
|
||||
(reference ,(nerd-icons-codicon "nf-cod-references") :face font-lock-variable-name-face)
|
||||
(snippet ,(nerd-icons-codicon "nf-cod-symbol_snippet") :face font-lock-string-face)
|
||||
(string ,(nerd-icons-codicon "nf-cod-symbol_string") :face font-lock-string-face)
|
||||
(struct ,(nerd-icons-codicon "nf-cod-symbol_structure") :face font-lock-variable-name-face)
|
||||
(text ,(nerd-icons-codicon "nf-cod-text_size") :face font-lock-doc-face)
|
||||
(typeparameter ,(nerd-icons-codicon "nf-cod-list_unordered") :face font-lock-type-face)
|
||||
(type-parameter ,(nerd-icons-codicon "nf-cod-list_unordered") :face font-lock-type-face)
|
||||
(unit ,(nerd-icons-codicon "nf-cod-symbol_ruler") :face font-lock-constant-face)
|
||||
(value ,(nerd-icons-codicon "nf-cod-symbol_field") :face font-lock-builtin-face)
|
||||
(variable ,(nerd-icons-codicon "nf-cod-symbol_variable") :face font-lock-variable-name-face)
|
||||
(t ,(nerd-icons-codicon "nf-cod-code") :face font-lock-warning-face))
|
||||
"Mapping of completion kinds to icons.
|
||||
|
||||
It should be a list of elements with the form (KIND ICON-TXT [:face FACE]).
|
||||
KIND is a symbol determining what the completion is, and comes from calling the
|
||||
`:company-kind' property of the completion. ICON-TXT is a string with the icon
|
||||
to use, usually as a character from the `nerd-icons' symbol font. See that
|
||||
package for how to get these. Note that it can be simple text if that is
|
||||
preferred. FACE, if present, is applied to the icon, mainly for its color. The
|
||||
special `t' symbol should be used for KIND to represent the default icon, and
|
||||
must be present.")
|
||||
|
||||
;;
|
||||
;;; Packages
|
||||
(use-package! corfu
|
||||
:hook (doom-first-buffer . global-corfu-mode)
|
||||
:hook (org-mode . corfu-mode)
|
||||
:init
|
||||
;; Auto-completion settings, must be set before calling `global-corfu-mode'.
|
||||
;; Due to lazy-loading, setting them in config.el works too.
|
||||
|
|
@ -16,8 +71,6 @@
|
|||
gud-mode
|
||||
vterm-mode))
|
||||
:config
|
||||
(add-to-list 'completion-styles 'partial-completion t)
|
||||
(add-to-list 'completion-styles 'initials t)
|
||||
(setq corfu-cycle t
|
||||
corfu-separator (when (modulep! +orderless) ?\s)
|
||||
corfu-preselect t
|
||||
|
|
@ -30,12 +83,50 @@
|
|||
;; In the case of +tng, TAB should be smart regarding completion;
|
||||
;; However, it should otherwise behave like normal, whatever normal was.
|
||||
tab-always-indent (if (modulep! +tng) 'complete tab-always-indent))
|
||||
|
||||
(when (modulep! +orderless)
|
||||
(cond ((modulep! :tools lsp +eglot) (add-to-list 'completion-category-overrides '(eglot (styles orderless))))
|
||||
((modulep! :tools lsp) (add-hook 'lsp-completion-mode-hook
|
||||
(defun doom--use-orderless-lsp-capf ()
|
||||
(setf (alist-get 'styles (alist-get 'lsp-capf completion-category-defaults))
|
||||
'(orderless)))))))
|
||||
(after! 'lsp-mode
|
||||
(add-to-list 'completion-category-overrides
|
||||
`(lsp-capf (styles ,@+corfu-completion-styles ,(when (modulep! +orderless) 'orderless)))))
|
||||
(after! 'eglot
|
||||
(add-to-list 'completion-category-overrides
|
||||
`(eglot (styles ,@+corfu-completion-styles ,(when (modulep! +orderless) 'orderless))))))
|
||||
|
||||
;; For the icons, we use a custom margin formatter, which simply reads the
|
||||
;; mapping in `+corfu-icon-mapping'.
|
||||
(when (modulep! +icons)
|
||||
(defun icon-margin-formatter (metadata)
|
||||
(when-let ((kindfunc (or (plist-get completion-extra-properties :company-kind)
|
||||
(assq 'company-kind metadata))))
|
||||
(lambda (cand)
|
||||
(let* ((kind (funcall kindfunc cand))
|
||||
(icon-entry (assq (or kind t) +corfu-icon-mapping))
|
||||
(str (cadr icon-entry))
|
||||
(props (cddr icon-entry))
|
||||
(extra-face (plist-get props :face))
|
||||
(space (propertize " " 'display '(space :width 1)))
|
||||
(str (concat " " str space)))
|
||||
(when extra-face
|
||||
(put-text-property 0 3 'face extra-face str))
|
||||
str))))
|
||||
(setq corfu-margin-formatters '(icon-margin-formatter)))
|
||||
|
||||
;; This is to decouple the use of `completion-styles' in corfu from other
|
||||
;; completion packages, such as vertico. That way, the user can leave the
|
||||
;; global value of the variable alone, say, to be used by the default
|
||||
;; front-end or consult. The vertico module also does something similar with
|
||||
;; `+vertico-company-completion-styles'.
|
||||
(defadvice! +corfu--completion-styles (orig &rest args)
|
||||
"Try default completion styles before orderless.
|
||||
|
||||
Meant as :around advice for `corfu--recompute'."
|
||||
:around #'corfu--recompute
|
||||
(let ((completion-styles
|
||||
(append +corfu-completion-styles (when (modulep! +orderless)
|
||||
'(orderless))))
|
||||
completion-category-overrides completion-category-defaults)
|
||||
(apply orig args)))
|
||||
|
||||
(map! (:unless (modulep! +tng)
|
||||
"C-SPC" #'completion-at-point)
|
||||
(:map 'corfu-map
|
||||
|
|
@ -46,8 +137,7 @@
|
|||
[backtab] #'corfu-previous
|
||||
"TAB" #'corfu-next
|
||||
"S-TAB" #'corfu-previous)))
|
||||
|
||||
(when (modulep! :editor evil)
|
||||
(after! evil-collection-corfu
|
||||
(evil-collection-define-key 'insert 'corfu-map
|
||||
(kbd "RET") #'corfu-insert
|
||||
[return] #'corfu-insert))
|
||||
|
|
@ -66,10 +156,9 @@
|
|||
(use-package! cape
|
||||
:after corfu
|
||||
:config
|
||||
(add-hook 'prog-mode-hook
|
||||
(lambda () (add-to-list 'completion-at-point-functions #'cape-file)))
|
||||
(add-hook! (markdown-mode org-mode)
|
||||
(lambda () (add-to-list 'completion-at-point-functions #'cape-elisp-block))))
|
||||
(add-hook! prog-mode (add-to-list 'completion-at-point-functions #'cape-file))
|
||||
(add-hook! (org-mode markdown-mode) (add-to-list 'completion-at-point-functions #'cape-elisp-block))
|
||||
(advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible))
|
||||
|
||||
(use-package! yasnippet-capf
|
||||
:after corfu
|
||||
|
|
@ -77,47 +166,6 @@
|
|||
(add-hook 'yas-minor-mode-hook
|
||||
(lambda () (add-to-list 'completion-at-point-functions #'yasnippet-capf))))
|
||||
|
||||
(use-package! svg-lib
|
||||
:after kind-icon)
|
||||
(use-package! kind-icon
|
||||
:commands (kind-icon-margin-formatter
|
||||
kind-icon-reset-cache
|
||||
kind-icon-formatted)
|
||||
:init
|
||||
(add-hook 'corfu-margin-formatters #'kind-icon-margin-formatter)
|
||||
:config
|
||||
(defface corfu-kind-icon '((t :inherit corfu-default))
|
||||
"Face for the icons in the corfu popup.
|
||||
For changing color, you should probably use `kind-icon-mapping', which see. The
|
||||
purpose here is overriding size and helping with scaling issues."
|
||||
:group 'corfu)
|
||||
(setq kind-icon-default-face 'corfu-kind-icon
|
||||
kind-icon-blend-background t
|
||||
kind-icon-blend-frac 0.2)
|
||||
(let ((def-style (svg-lib-style-compute-default 'corfu-kind-icon))
|
||||
res)
|
||||
(cl-loop for (key value) on def-style by 'cddr
|
||||
do (unless (member key '(:foreground
|
||||
:background
|
||||
:font-size
|
||||
:font-width
|
||||
:font-weight
|
||||
:font-family
|
||||
:width))
|
||||
(setq res (plist-put res key value))))
|
||||
(setq kind-icon-default-style (plist-put res :stroke 0.25)))
|
||||
(defadvice! doom--kind-icon-remove-padding (orig kind)
|
||||
"Rescale icon images to 1, and set surrounding spaces to width 0.
|
||||
This fixes the cropping due to scaling issues."
|
||||
:around #'kind-icon-formatted
|
||||
(let* ((text (funcall orig kind))
|
||||
(image (get-text-property 1 'display text)))
|
||||
(when (eq (car-safe image) 'image)
|
||||
(setf (image-property image :scale) 1)
|
||||
(put-text-property 0 1 'display '(space :width (0)) text)
|
||||
(put-text-property 2 3 'display '(space :width (0)) text))
|
||||
text)))
|
||||
|
||||
(use-package! corfu-terminal
|
||||
:when (not (display-graphic-p))
|
||||
:hook (corfu-mode . corfu-terminal-mode))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue