new and impruved
This commit is contained in:
153
dots/doom/.back.modules/completion/corfu/README.org
Executable file
153
dots/doom/.back.modules/completion/corfu/README.org
Executable file
@@ -0,0 +1,153 @@
|
||||
#+title: :completion corfu
|
||||
#+subtitle: Complete with cap(f), cape and a flying feather
|
||||
#+created: September 9, 2022
|
||||
#+since: 3.0.0 (#7002)
|
||||
|
||||
* Description :unfold:
|
||||
This module provides code completion, powered by [[https://github.com/minad/corfu][corfu]].
|
||||
|
||||
It is recommended to enable either this or [[doom-module:][:completion company]], in case you
|
||||
desire pre-configured auto-completion. Corfu is much lighter weight and focused,
|
||||
plus it's built on native Emacs functionality, whereas company is heavy and
|
||||
highly non-native, but has some extra features and more maturity.
|
||||
|
||||
** Maintainers
|
||||
- [[doom-user:][@LuigiPiucco]]
|
||||
|
||||
[[doom-contrib-maintainer:][Become a maintainer?]]
|
||||
|
||||
** Module flags
|
||||
- +icons ::
|
||||
Display icons beside completion suggestions.
|
||||
- +tng ::
|
||||
Invoke completion on [[kbd:][TAB]]. When corfu is active, [[kbd:][TAB]] and [[kbd:][S-TAB]] will navigate
|
||||
the completion candidates. Arrow keys and evil-style movement are still
|
||||
supported.
|
||||
|
||||
** Packages
|
||||
- [[doom-package:][corfu]]
|
||||
- [[doom-package:][cape]]
|
||||
- [[doom-package:][kind-icon]] if [[doom-module:][:completion corfu +icons]]
|
||||
- [[doom-package:][corfu-terminal]] if [[doom-module:][:os tty]]
|
||||
|
||||
** Hacks
|
||||
/No hacks documented for this module./
|
||||
|
||||
** TODO Changelog
|
||||
# This section will be machine generated. Don't edit it by hand.
|
||||
/This module does not have a changelog yet./
|
||||
|
||||
* Installation
|
||||
Enable this module in your ~doom!~ block.
|
||||
|
||||
This module has no direct requirements, but some languages may have their own
|
||||
requirements to fulfill before you get code completion in them (and some
|
||||
languages may lack code completion support altogether). Run ~$ doom doctor~ to
|
||||
find out if you're missing any dependencies. Note that corfu may have support
|
||||
for completions in languages that have no development intelligence, since it
|
||||
supports generic, context insensitive candidates such as file names or recurring
|
||||
words.
|
||||
|
||||
* TODO Usage
|
||||
#+begin_quote
|
||||
🔨 /This module's usage documentation is incomplete./ [[doom-contrib-module:][Complete it?]]
|
||||
#+end_quote
|
||||
|
||||
** Code completion
|
||||
By default, completion gets triggered after typing 2 non-space consecutive
|
||||
characters, or by means of the [[kbd:][C-SPC]] keybinding at any moment. While the popup
|
||||
is visible, the following relevant keys are available:
|
||||
|
||||
| Keybind | Description |
|
||||
|----------+------------------------------------------------------|
|
||||
| [[kbd:][<down>]] | Go to next candidate |
|
||||
| [[kbd:][<up>]] | Go to previous candidate |
|
||||
| [[kbd:][C-n]] | Go to next candidate |
|
||||
| [[kbd:][C-p]] | Go to previous candidate |
|
||||
| [[kbd:][C-j]] | (evil) Go to next candidate |
|
||||
| [[kbd:][C-k]] | (evil) Go to previous candidate |
|
||||
| [[kbd:][C-<down>]] | Go to next doc line |
|
||||
| [[kbd:][C-<up>]] | Go to previous doc line |
|
||||
| [[kbd:][C-S-n]] | Go to next doc line |
|
||||
| [[kbd:][C-S-p]] | Go to previous doc line |
|
||||
| [[kbd:][C-S-j]] | (evil) Go to next doc line |
|
||||
| [[kbd:][C-S-k]] | (evil) Go to previous doc line |
|
||||
| [[kbd:][C-h]] | Toggle documentation (if available) |
|
||||
| [[kbd:][s-<down>]] | Export to minibuffer (if [[doom-module:][:completion vertico]]) |
|
||||
| [[kbd:][s-j]] | (evil) Export to minibuffer (if [[doom-module:][:completion vertico]]) |
|
||||
| [[kbd:][RET]] | Insert candidate |
|
||||
| [[kbd:][C-SPC]] | (when completing) Insert separator (see below) |
|
||||
| [[kbd:][C-SPC]] | Complete (unless [[doom-module:][:completion corfu +tng]]) |
|
||||
|
||||
If you prefer a [[kbd:][TAB]]-centric completion style, enable the [[doom-module:][:completion corfu +tng]]
|
||||
flag so that, instead, you trigger completion with [[kbd:][TAB]], getting the following
|
||||
additional binds:
|
||||
|
||||
| Keybind | Description |
|
||||
|---------+--------------------------------------------|
|
||||
| [[kbd:][TAB]] | Complete |
|
||||
| [[kbd:][TAB]] | (when completing) Go to next candidate |
|
||||
| [[kbd:][S-TAB]] | (when completing) Go to previous candidate |
|
||||
|
||||
** Searching with multiple keywords
|
||||
If the [[doom-module:][:completion vertico]] module is enabled, users can perform code completion
|
||||
with multiple search keywords by use of space as separator. More information can
|
||||
be found [[https://github.com/oantolin/orderless#company][here]]. Pressing [[kdb:][C-SPC]] again while completing inserts a space as
|
||||
separator. This allows searching with space-separated terms; each piece will
|
||||
match individually and in any order, with smart casing. Pressing just [[kbd:][SPC]] acts
|
||||
as normal and restarts completion, so that when typing sentences it doesn't try
|
||||
to complete the whole sentence instead of just the word.
|
||||
|
||||
Without [[doom-module:][:completion vertico]], it still works, just not as intelligently, due to
|
||||
the lack of orderless.
|
||||
|
||||
** Exporting to the minibuffer (requires [[doom-module:][:completion vertico]])
|
||||
When using the [[doom-module:][:completion vertico]] module, which pulls in the [[doom-package:][consult]] package,
|
||||
the entries shown in the completion popup can be exported to a consult
|
||||
minibuffer, giving access to all the manipulations the vertico suite allows. For
|
||||
instance, one could use this to export with [[doom-package:][embark]] via [[kbd:][C-c C-l]] and get a buffer
|
||||
with all candidates.
|
||||
|
||||
** Ispell completion
|
||||
Ispell completion is supported, so long as you point to the right ~.dic~ file in
|
||||
~ispell-alternate-dictionary~. For selected text modes (see the configuration
|
||||
section) it completes everywhere, for programming modes it can complete in
|
||||
comments and strings.
|
||||
|
||||
* Configuration
|
||||
A few variables may be set to change behavior of this module:
|
||||
|
||||
- +corfu-auto-delay ::
|
||||
Number of seconds till completion occurs automatically. Defaults to 0.1.
|
||||
- +corfu-auto-prefix ::
|
||||
Number of characters till auto-completion starts to happen. Defaults to 2.
|
||||
- +corfu-want-multi-component ::
|
||||
Sets whether orderless-style matching should be supported with space as a
|
||||
separator.
|
||||
- +corfu-ispell-completion-modes ::
|
||||
Lists modes in which to add ~cape-ispell~ as a capf. These show be majorly
|
||||
text modes, else you will get lots of bad suggestions, since when this matches
|
||||
it interrupts the flow of candidate selection.
|
||||
- +corfu-ispell-in-comments-and-strings ::
|
||||
Whether we should complete when point is inside a string or comment. If
|
||||
non-nil, works as in a text mode, else gives programming completions just like
|
||||
in the rest of the buffer.
|
||||
|
||||
Additionally, if you prefer to never stop completion on [[kbd:][SPC]], add the following
|
||||
to your ~config.el~:
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(map! :map corfu-map
|
||||
:desc "insert separator" "C-SPC" #'corfu-insert-separator)
|
||||
#+end_src
|
||||
|
||||
* Troubleshooting
|
||||
[[doom-report:][Report an issue?]]
|
||||
|
||||
* Frequently asked questions
|
||||
/This module has no FAQs yet./ [[doom-suggest-faq:][Ask one?]]
|
||||
|
||||
* TODO Appendix
|
||||
#+begin_quote
|
||||
🔨 This module has no appendix yet. [[doom-contrib-module:][Write one?]]
|
||||
#+end_quote
|
||||
188
dots/doom/.back.modules/completion/corfu/config.el
Executable file
188
dots/doom/.back.modules/completion/corfu/config.el
Executable file
@@ -0,0 +1,188 @@
|
||||
;;; completion/corfu/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +corfu-auto-delay 0.1
|
||||
"How long after point stands still will completion be called automatically,
|
||||
in seconds.
|
||||
|
||||
Setting `corfu-auto-delay' directly may not work, as it needs to be set *before*
|
||||
enabling `corfu-mode'.")
|
||||
(defvar +corfu-auto-prefix 2
|
||||
"How many characters should be typed before auto-complete starts to kick in.
|
||||
|
||||
Setting `corfu-auto-prefix' directly may not work, as it needs to be set
|
||||
*before* enabling `corfu-mode'.")
|
||||
(defvar +corfu-want-multi-component t
|
||||
"Enables multiple component search, with pieces separated by spaces.
|
||||
|
||||
This allows search of non-contiguous unordered bits, for instance by typing
|
||||
\"tear rip\" to match \"rip-and-tear\". Notice the space, it does not break
|
||||
completion in this case.")
|
||||
(defvar +corfu-icon-height 0.9
|
||||
"The height applied to the icons (it is passed to both svg-lib and kind-icon).
|
||||
|
||||
It may need tweaking for the completions to not become cropped at the end.
|
||||
Note that changes are applied only after a cache reset, via
|
||||
`kind-icon-reset-cache'.")
|
||||
|
||||
(defvar +corfu-ispell-completion-modes '(org-mode markdown-mode text-mode)
|
||||
"Modes to enable ispell completion in.
|
||||
|
||||
For completion in comments, see `+corfu-ispell-in-comments-and-strings'.")
|
||||
(defvar +corfu-ispell-in-comments-and-strings t
|
||||
"Enable completion with ispell inside comments when in a `prog-mode'
|
||||
derivative.")
|
||||
|
||||
;;
|
||||
;;; Packages
|
||||
(use-package! corfu
|
||||
:hook (doom-first-buffer . global-corfu-mode)
|
||||
:init
|
||||
;; Auto-completion settings, must be set before calling `global-corfu-mode'.
|
||||
(setq corfu-auto t
|
||||
corfu-auto-delay +corfu-auto-delay
|
||||
corfu-auto-prefix +corfu-auto-prefix
|
||||
corfu-excluded-modes '(erc-mode
|
||||
circe-mode
|
||||
help-mode
|
||||
gud-mode
|
||||
vterm-mode))
|
||||
|
||||
:config
|
||||
(when (and (modulep! :tools lsp) (not (modulep! :tools lsp +eglot)))
|
||||
(add-hook 'lsp-mode-hook (defun doom--add-lsp-capf ()
|
||||
(add-to-list 'completion-at-point-functions (cape-capf-buster #'lsp-completion-at-point)))
|
||||
;; Below is so that context specific completions in cape come first.
|
||||
:depth 1))
|
||||
(add-to-list 'completion-styles 'partial-completion t)
|
||||
(add-to-list 'completion-styles 'initials t)
|
||||
(setq corfu-cycle t
|
||||
corfu-separator (when +corfu-want-multi-component ?\s)
|
||||
corfu-preselect t
|
||||
corfu-count 16
|
||||
corfu-max-width 120
|
||||
corfu-preview-current 'insert
|
||||
corfu-quit-at-boundary (if +corfu-want-multi-component 'separator t)
|
||||
corfu-quit-no-match (if +corfu-want-multi-component 'separator t)
|
||||
;; 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))
|
||||
;; Only done with :tools vertico active due to orderless. Alternatively, we
|
||||
;; could set it up here if it's not there.
|
||||
(when (and +corfu-want-multi-component (modulep! :completion vertico))
|
||||
(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)))))))
|
||||
(map! (:unless (modulep! +tng)
|
||||
:desc "complete" "C-SPC" #'completion-at-point)
|
||||
(:map 'corfu-map
|
||||
(:when +corfu-want-multi-component
|
||||
:desc "insert separator" "C-SPC" #'corfu-insert-separator)
|
||||
(:when (modulep! :completion vertico)
|
||||
:desc "move to minibuffer" "s-<down>" #'corfu-move-to-minibuffer
|
||||
(:when (modulep! :editor evil)
|
||||
:desc "move to minibuffer" "s-j" #'corfu-move-to-minibuffer))
|
||||
(:when (modulep! +tng)
|
||||
:desc "next" [tab] #'corfu-next
|
||||
:desc "previous" [backtab] #'corfu-previous
|
||||
:desc "next" "TAB" #'corfu-next
|
||||
:desc "previous" "S-TAB" #'corfu-previous))))
|
||||
|
||||
;; Taken from corfu's README.
|
||||
;; TODO: extend this to other completion front-ends, mainly helm and ido, since
|
||||
;; ivy is being considered for removal.
|
||||
(when (modulep! :completion vertico)
|
||||
(defun corfu-move-to-minibuffer ()
|
||||
(interactive)
|
||||
(let ((completion-extra-properties corfu--extra)
|
||||
completion-cycle-threshold completion-cycling)
|
||||
(apply #'consult-completion-in-region completion-in-region--data))))
|
||||
|
||||
(use-package! cape
|
||||
:after corfu
|
||||
:commands (cape-dabbrev
|
||||
cape-file
|
||||
cape-history
|
||||
cape-keyword
|
||||
cape-tex
|
||||
cape-sgml
|
||||
cape-rfc1345
|
||||
cape-abbrev
|
||||
cape-ispell
|
||||
cape-dict
|
||||
cape-symbol
|
||||
cape-line)
|
||||
:init
|
||||
(add-to-list 'completion-at-point-functions #'cape-file)
|
||||
(when +corfu-ispell-in-comments-and-strings
|
||||
(defalias 'corfu--ispell-in-comments-and-strings
|
||||
(cape-super-capf (cape-capf-inside-comment #'cape-ispell)
|
||||
(cape-capf-inside-string #'cape-ispell)))
|
||||
(add-hook 'prog-mode-hook
|
||||
(lambda ()
|
||||
(add-to-list 'completion-at-point-functions #'corfu--ispell-in-comments-and-strings))))
|
||||
(dolist (sym +corfu-ispell-completion-modes)
|
||||
(add-hook (intern (concat (symbol-name sym) "-hook"))
|
||||
(lambda ()
|
||||
(add-to-list 'completion-at-point-functions #'cape-ispell))))
|
||||
(add-hook! '(TeX-mode-hook LaTeX-mode-hook org-mode-hook)
|
||||
(lambda ()
|
||||
(add-to-list 'completion-at-point-functions #'cape-tex t))
|
||||
:depth 2)
|
||||
(add-hook! '(html-mode-hook +web-react-mode-hook typescript-tsx-mode-hook org-mode-hook markdown-mode-hook)
|
||||
(lambda ()
|
||||
(add-to-list 'completion-at-point-functions #'cape-sgml t))
|
||||
:depth 2)
|
||||
(add-to-list 'completion-at-point-functions #'cape-dabbrev)
|
||||
(add-to-list 'completion-at-point-functions #'cape-keyword)
|
||||
:config
|
||||
;; Enhances speed on large projects, for which many buffers may be open.
|
||||
(setq cape-dabbrev-check-other-buffers nil))
|
||||
|
||||
(use-package! kind-icon
|
||||
:when (modulep! +icons)
|
||||
:commands kind-icon-margin-formatter
|
||||
:init
|
||||
(add-hook 'corfu-margin-formatters #'kind-icon-margin-formatter)
|
||||
:config
|
||||
(setq kind-icon-default-face 'corfu-default
|
||||
kind-icon-blend-background t
|
||||
kind-icon-blend-frac 0.2)
|
||||
(plist-put kind-icon-default-style :height +corfu-icon-height)
|
||||
(plist-put svg-lib-style-default :height +corfu-icon-height))
|
||||
|
||||
(use-package! corfu-terminal
|
||||
:when (and (modulep! :os tty) (not (display-graphic-p)))
|
||||
:hook (corfu-mode . corfu-terminal-mode))
|
||||
|
||||
(use-package! dabbrev
|
||||
:config
|
||||
(setq dabbrev-ignored-buffer-regexps '("\\.\\(?:pdf\\|jpe?g\\|png\\)\\'")))
|
||||
|
||||
(setq read-extended-command-predicate
|
||||
#'command-completion-default-include-p)
|
||||
|
||||
;;
|
||||
;;; Extensions
|
||||
(use-package! corfu-history
|
||||
:after savehist
|
||||
:hook (corfu-mode . corfu-history-mode)
|
||||
:config
|
||||
(add-to-list 'savehist-additional-variables 'corfu-history))
|
||||
(use-package! corfu-popupinfo
|
||||
:hook (corfu-mode . corfu-popupinfo-mode)
|
||||
:config
|
||||
(setq corfu-popupinfo-delay '(0.5 . 1.0))
|
||||
(map! (:map 'corfu-map
|
||||
:desc "scroll info up" "C-<up>" #'corfu-popupinfo-scroll-down
|
||||
:desc "scroll info down" "C-<down>" #'corfu-popupinfo-scroll-up
|
||||
:desc "scroll info up" "C-S-p" #'corfu-popupinfo-scroll-down
|
||||
:desc "scroll info down" "C-S-n" #'corfu-popupinfo-scroll-up
|
||||
:desc "toggle info" "C-h" #'corfu-popupinfo-toggle)
|
||||
(:map 'corfu-popupinfo-map
|
||||
:when (modulep! :editor evil)
|
||||
;; Reversed because popupinfo assumes opposite of what feels intuitive
|
||||
;; with evil.
|
||||
:desc "scroll info up" "C-S-k" #'corfu-popupinfo-scroll-down
|
||||
:desc "scroll info down" "C-S-j" #'corfu-popupinfo-scroll-up)))
|
||||
10
dots/doom/.back.modules/completion/corfu/packages.el
Executable file
10
dots/doom/.back.modules/completion/corfu/packages.el
Executable file
@@ -0,0 +1,10 @@
|
||||
;; -*- no-byte-compile: t; -*-
|
||||
;;; completion/corfu/packages.el
|
||||
|
||||
(package! corfu :recipe (:files ("*.el" "extensions/*.el")))
|
||||
(package! cape)
|
||||
(package! dabbrev)
|
||||
(when (modulep! +icons)
|
||||
(package! kind-icon))
|
||||
(when (modulep! :os tty)
|
||||
(package! corfu-terminal))
|
||||
Reference in New Issue
Block a user