[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/corfu 1434e7f 2/6: Align annotations (Fix #18)
From: |
Protesilaos Stavrou |
Subject: |
[elpa] externals/corfu 1434e7f 2/6: Align annotations (Fix #18) |
Date: |
Fri, 30 Apr 2021 13:32:53 -0400 (EDT) |
branch: externals/corfu
commit 1434e7f051cb7366f6fa652913c6dbcfe015860a
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Align annotations (Fix #18)
---
corfu.el | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/corfu.el b/corfu.el
index ad053bf..7d08dac 100644
--- a/corfu.el
+++ b/corfu.el
@@ -418,14 +418,19 @@ Set to nil in order to disable confirmation."
"Return PROP from METADATA."
(cdr (assq prop metadata)))
-(defun corfu--format-candidate (cand)
- "Format annotated CAND string."
- (if (consp cand)
- (concat (cadr cand) (car cand)
- (if (text-property-not-all 0 (length (caddr cand)) 'face nil
(caddr cand))
- (caddr cand)
- (propertize (caddr cand) 'face 'completions-annotations)))
- cand))
+(defun corfu--format-candidate ()
+ "Format candidates."
+ (let ((mw (ceiling (* corfu-margin-width (frame-char-width)))))
+ (lambda (c)
+ (if (consp c)
+ (concat
+ (cadr c) (car c)
+ (propertize " " 'display
+ `(space :align-to (- right ,(length (caddr c)) (,mw))))
+ (if (text-property-not-all 0 (length (caddr c)) 'face nil (caddr c))
+ (caddr c)
+ (propertize (caddr c) 'face 'completions-annotations)))
+ c))))
(defun corfu--show-candidates (beg end str metadata)
"Update display given BEG, END, STR and METADATA."
@@ -436,7 +441,7 @@ Set to nil in order to disable confirmation."
(bar (ceiling (* corfu-count corfu-count) corfu--total))
(lo (min (- corfu-count bar 1) (floor (* corfu-count start)
corfu--total)))
(cands (funcall corfu--highlight (seq-subseq corfu--candidates start
last)))
- (ann-cands (mapcar #'corfu--format-candidate (corfu--annotate
metadata cands))))
+ (ann-cands (mapcar (corfu--format-candidate) (corfu--annotate
metadata cands))))
(when corfu--overlay
(delete-overlay corfu--overlay)
(setq corfu--overlay nil))
- [elpa] externals/corfu updated (17f3fc6 -> 9c9be9c), Protesilaos Stavrou, 2021/04/30
- [elpa] externals/corfu 1434e7f 2/6: Align annotations (Fix #18),
Protesilaos Stavrou <=
- [elpa] externals/corfu 03e2318 3/6: HACK: Try to fix resizing issue (Fix #17), Protesilaos Stavrou, 2021/04/30
- [elpa] externals/corfu cf6c7ce 1/6: Overlay fix, Protesilaos Stavrou, 2021/04/30
- [elpa] externals/corfu 4ef4ca3 5/6: Ensure that case-fold-search=t (See #17), Protesilaos Stavrou, 2021/04/30
- [elpa] externals/corfu 319edfb 4/6: Detect both gnome and cinnamon, Protesilaos Stavrou, 2021/04/30
- [elpa] externals/corfu 9c9be9c 6/6: Add links to issues, Protesilaos Stavrou, 2021/04/30