We previously implemented only consult/vertico as a target for export, now we have all of them. It was necessary to use case-by-case conditions, unfortunately, because other UIs have subtle quirks that prevent a single generalized approach to work. Ivy is almost compliant, but it needs beg and end to not be markers. Helm doesn't replace `completion-in-region-function`, it expects to go around the default `completion--in-region`, so a small addition was made to its module, because we weren't doing that. This was likely an oversight due to the non-standard usage. This was fixed here because we need it working for this feature. Ido doesn't implement `completion-in-region` and its `completing-read` is retricted to a list of strings as table, so it's treated the same as absence of a framework, because it lacks the needed features.
51 lines
2.4 KiB
EmacsLisp
51 lines
2.4 KiB
EmacsLisp
;;; completion/corfu/autoload.el -*- lexical-binding: t; -*-
|
|
|
|
;;;###autoload
|
|
(defun +corfu-complete-and-exit-minibuffer ()
|
|
(interactive)
|
|
(if (>= corfu--index 0)
|
|
(corfu-complete)
|
|
(corfu-insert))
|
|
(exit-minibuffer))
|
|
|
|
;;;###autoload
|
|
(defun +corfu-move-to-minibuffer ()
|
|
"Move the current list of candidates to your choice of minibuffer completion UI."
|
|
(interactive)
|
|
(pcase completion-in-region--data
|
|
(`(,beg ,end ,table ,pred ,extras)
|
|
(let ((completion-extra-properties extras)
|
|
completion-cycle-threshold completion-cycling)
|
|
(cond ((and (modulep! :completion vertico)
|
|
(fboundp #'consult-completion-in-region))
|
|
(consult-completion-in-region beg end table pred))
|
|
((and (modulep! :completion ivy)
|
|
(fboundp #'ivy-completion-in-region))
|
|
(ivy-completion-in-region (marker-position beg) (marker-position end) table pred))
|
|
;; Helm is special and wants to _wrap_ `completion--in-region'
|
|
;; instead of replacing it in `completion-in-region-function'.
|
|
((and (modulep! :completion helm)
|
|
(fboundp #'helm--completion-in-region)
|
|
(advice-member-p #'helm--completion-in-region #'completion--in-region))
|
|
;; Important: `completion-in-region-function' is set to corfu at
|
|
;; this moment, so `completion-in-region' (single -) doesn't work.
|
|
(completion--in-region beg end table pred))
|
|
;; Ido doesn't implement `completion-in-region', and its
|
|
;; `completing-read' only accepts a plain list of strings as table,
|
|
;; so there's not much we can do with it.
|
|
(t (error "No minibuffer completion UI available for moving to!")))))))
|
|
|
|
;;;###autoload
|
|
(defun +corfu-smart-sep-toggle-escape ()
|
|
"Insert `corfu-separator' or toggle escape if it's already there."
|
|
(interactive)
|
|
(cond ((and (char-equal (char-before) corfu-separator)
|
|
(char-equal (char-before (1- (point))) ?\\))
|
|
(save-excursion (delete-char -2)))
|
|
((char-equal (char-before) corfu-separator)
|
|
(save-excursion (backward-char 1)
|
|
(insert-char ?\\)))
|
|
(t
|
|
;; Without this corfu quits immediately.
|
|
(setq this-command #'corfu-insert-separator)
|
|
(call-interactively #'corfu-insert-separator))))
|