[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/corfu 1db9916 11/11: Show "No match" message if no cand
From: |
Protesilaos Stavrou |
Subject: |
[elpa] externals/corfu 1db9916 11/11: Show "No match" message if no candidates are found |
Date: |
Tue, 27 Apr 2021 11:39:08 -0400 (EDT) |
branch: externals/corfu
commit 1db991614879ef5d835a7dd71a38e6df64f3f62f
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Show "No match" message if no candidates are found
---
corfu.el | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/corfu.el b/corfu.el
index 3e61df0..d262ecf 100644
--- a/corfu.el
+++ b/corfu.el
@@ -392,7 +392,7 @@ If `line-spacing/=nil' or in text-mode, the background
color is used instead.")
suffix
(propertize suffix 'face 'completions-annotations)))))
-(defun corfu--update-display (beg end str metadata)
+(defun corfu--show-candidates (beg end str metadata)
"Update display given BEG, END, STR and METADATA."
(let* ((start (min (max 0 (- corfu--index (/ corfu-count 2)))
(max 0 (- corfu--total corfu-count))))
@@ -420,7 +420,8 @@ If `line-spacing/=nil' or in text-mode, the background
color is used instead.")
(pcase-let* ((`(,beg ,end ,table ,pred) completion-in-region--data)
(pt (- (point) beg))
(str (buffer-substring-no-properties beg end))
- (metadata (completion-metadata (substring str 0 pt) table
pred)))
+ (metadata (completion-metadata (substring str 0 pt) table pred))
+ (initializing (not corfu--input)))
(cond
;; XXX Guard against errors during candidate generation.
;; Turn off completion immediately if there are errors
@@ -430,16 +431,19 @@ If `line-spacing/=nil' or in text-mode, the background
color is used instead.")
(unless (equal corfu--input (cons str pt))
(and (corfu--update-candidates str metadata pt table pred)) nil)
(t (message "%s" (error-message-string err)))))
- ((and (not corfu--candidates) ;; 1. There are no candidates
- corfu-confirm) ;; 2. Confirmation is enabled
- (corfu--popup beg (list corfu-confirm)))
+ ((and (not corfu--candidates) ;; 1. There are no
candidates
+ initializing) ;; 2. Initializing,
first retrieval of candidates.
+ (minibuffer-message "No match")) ;; ==> Show error message
+ ((and (not corfu--candidates) ;; 1. There are no
candidates
+ corfu-confirm) ;; 2. Confirmation is
enabled
+ (corfu--popup beg (list corfu-confirm))) ;; ==> Show confirm popup
((and corfu--candidates ;; 1. There exist
candidates
(not (equal corfu--candidates (list str))) ;; 2. Not a sole exactly
matching candidate
(or (/= beg end) ;; 3. Input is non-empty
- (eq this-command 'completion-at-point)
+ (eq this-command 'completion-at-point) ;; ==> Show candidates
popup
(and (symbolp this-command)
(string-match-p corfu--keep-alive (symbol-name
this-command)))))
- (corfu--update-display beg end str metadata))
+ (corfu--show-candidates beg end str metadata))
;; When after `completion-at-point/corfu-complete', no further completion
is possible and the
;; current string is a valid match, exit with status 'finished.
((and (memq this-command '(corfu-complete completion-at-point))
- [elpa] externals/corfu updated (71386bf -> 1db9916), Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu 8b4d5d8 02/11: Simplify corfu--restore-on-next-command, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu 6dfa254 01/11: Fix corfu-show-location, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu 6845fb0 03/11: Simplify corfu--pre-command-hook, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu a04dfe5 04/11: Add `corfu-confirm`, more tolerance for typos (Fix #14), Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu fe8674a 05/11: Ensure that the corfu popup works with `dabbrev-completion`, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu 1db9916 11/11: Show "No match" message if no candidates are found,
Protesilaos Stavrou <=
- [elpa] externals/corfu 5641e3b 06/11: Update readme, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu 0b87702 07/11: Add `corfu-excluded-modes`, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu 9dc4759 09/11: Exit conditions: Minor cleanup, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu ed3a26b 10/11: Better guarding against errors during candidate generation, Protesilaos Stavrou, 2021/04/27
- [elpa] externals/corfu ba858df 08/11: Guard against dabbrev error if there are no matches, Protesilaos Stavrou, 2021/04/27