[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia 1120eff 210/241: Revert b6994e0ebca6488f3799
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia 1120eff 210/241: Revert b6994e0ebca6488f379914a1506af833a1abd928 and 06ae3b4c466801962b7611c851e62bf0c749fbbf |
Date: |
Fri, 28 May 2021 20:49:28 -0400 (EDT) |
branch: externals/marginalia
commit 1120effdf43fde5aaaef67291b5e860939014501
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Revert b6994e0ebca6488f379914a1506af833a1abd928 and
06ae3b4c466801962b7611c851e62bf0c749fbbf
Go back to 6caf9f03972e99c0096a88ed1fc56cd91ebab975 + completion-boundaries
fixes.
---
marginalia.el | 56 +++++++++++++++++++++++++++-----------------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 9b72c7a..f99581b 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -30,7 +30,7 @@
;;; Code:
(require 'subr-x)
-(require 'cl-lib)
+(eval-when-compile (require 'cl-lib))
;;;; Customization
@@ -635,14 +635,20 @@ The string is transformed according to
`marginalia-bookmark-type-transformers'."
:truncate (/ marginalia-truncate-width 2)
:face 'marginalia-file-name))))
-;; This function is only used for file candidates and is necessary
-;; because otherwise file-attributes won't find the file. It is
-;; complicated by the partial-completion completion style, which can
-;; complete /u/s/d/w to /usr/share/dict/words. This means that we need
-;; to replace some of the path components in the minibuffer contents
-;; with those from the completion candidate.
-(defun marginalia--full-file (file)
- "Return full path to completion candidate FILE."
+;; At some point we might want to revisit how this function is implemented.
Maybe we come up with a
+;; more direct way to implement it. While Emacs does not use the notion of
"full candidate", there
+;; is a function `completion-boundaries' to compute them, and in (info
"(elisp)Programmed
+;; Completion") it is documented how a completion table should respond to
boundaries requests.
+;; See the discussion at
https://github.com/minad/marginalia/commit/4ba98045dd33bcf1396a888dbbae2dc801dce7c5
+(defun marginalia--full-candidate (cand)
+ "Return completion candidate CAND in full.
+For some completion tables, the completion candidates offered are
+meant to be only a part of the full minibuffer contents. For
+example, during file name completion the candidates are one path
+component of a full file path.
+
+This function returns what would be the minibuffer contents after
+using `minibuffer-force-complete' on the candidate CAND."
(if-let (win (active-minibuffer-window))
(with-current-buffer (window-buffer win)
(let* ((contents (minibuffer-contents-no-properties))
@@ -658,24 +664,13 @@ The string is transformed according to
`marginalia-bookmark-type-transformers'."
minibuffer-completion-table
minibuffer-completion-predicate
after)
- (t (cons 0 (length after))))))
- (components (split-string (substring before 0 (car bounds))
"/"))
- (num-replace (if (string-suffix-p "/" file)
- (cl-count ?/ file)
- (1+ (cl-count ?/ file))) ))
- ;; use expand-file-name in case path is relative, to get the
- ;; correct default-directory from the minibuffer (normally,
- ;; say for find-file, the path is only relative if the user
- ;; deletes the initial / or ~/)
- (expand-file-name
- (string-join
- (append
- (cl-subseq components 0 (max 0 (- (length components)
num-replace)))
- (list file))
- "/"))))
- ;; no minibuffer is active, trust that FILE already conveys all
+ (t (cons 0 (length after)))))))
+ (concat (substring contents 0 (car bounds))
+ cand
+ (substring contents (+ pt (cdr bounds))))))
+ ;; no minibuffer is active, trust that cand already conveys all
;; necessary information (there's not much else we can do)
- file))
+ cand))
(defun marginalia--remote-p (path)
"Return t if PATH is a remote path."
@@ -689,7 +684,7 @@ These annotations are skipped for remote paths."
(with-current-buffer (window-buffer win)
(marginalia--remote-p (minibuffer-contents-no-properties)))))
(marginalia--fields ("*Remote*" :face 'marginalia-documentation))
- (when-let (attributes (file-attributes (substitute-in-file-name
(marginalia--full-file cand)) 'string))
+ (when-let (attributes (file-attributes (substitute-in-file-name
(marginalia--full-candidate cand)) 'string))
(marginalia--fields
((file-attribute-modes attributes) :face 'marginalia-file-modes)
((format "%s:%s"
@@ -732,8 +727,11 @@ These annotations are skipped for remote paths."
This runs through the `marginalia-prompt-categories' alist
looking for a regexp that matches the prompt."
(when-let (prompt (minibuffer-prompt))
- (setq prompt (replace-regexp-in-string "(.*default.*)\\|\\[.*\\]" ""
prompt))
- (cdr (cl-find-if (lambda (x) (string-match-p (car x) prompt))
marginalia-prompt-categories))))
+ (setq prompt
+ (replace-regexp-in-string "(.*default.*)\\|\\[.*\\]" "" prompt))
+ (cl-loop for (regexp . category) in marginalia-prompt-categories
+ when (string-match-p regexp prompt)
+ return category)))
(defmacro marginalia--context (metadata &rest body)
"Setup annotator context with completion METADATA around BODY."
- [elpa] externals/marginalia 58f397d 187/241: update readme, (continued)
- [elpa] externals/marginalia 58f397d 187/241: update readme, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia c93b1b3 188/241: marginalia--full-candidate: Do not switch entire window, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia e54aa0c 193/241: Revert "Revert "fix #46: affixation suffix must not be nil, it must be a string"", Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 153417a 192/241: marginalia-annotate-file: Use substitute-in-file-name, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2d19497 208/241: marginalia--full-file: Ensure that pt >= 0 if cursor is moved into the prompt, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia f263745 201/241: marginalia-annotate-color: Use readable-foreground-color, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia b6994e0 203/241: Attempt to fix full candidate function for files (#65), Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia f3eaa1a 197/241: Add annotator for the embark-keybinding category, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 9559819 209/241: Add link to upstream bug, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia c476b6c 212/241: Track completion base position for marginalia--full-candidate, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 1120eff 210/241: Revert b6994e0ebca6488f379914a1506af833a1abd928 and 06ae3b4c466801962b7611c851e62bf0c749fbbf,
Stefan Monnier <=
- [elpa] externals/marginalia dca1cb5 213/241: marginalia--base-position: Minor changes, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 1d3af0a 219/241: Merge branch 'base-position' into main, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 7fe1a03 218/241: Fix retrieving full paths under Selectrum, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia cd28764 232/241: marginalia-annotator-registry: Use more precise type, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 624028c 235/241: Silence bytecode compiler warning regarding project-roots (Fix #79), Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia ac4ab98 227/241: Implement individual cycling per completion category (Fix #73), Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 3f33b38 238/241: Prepare submission to ELPA, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia e97979a 240/241: Remove License header, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 09aaad9 159/241: Revert "fix #46: affixation suffix must not be nil, it must be a string", Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 42977b4 162/241: add comment, Stefan Monnier, 2021/05/28