[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/marginalia 2b926ae 190/241: Avoid annotations for host
From: |
Stefan Monnier |
Subject: |
[elpa] externals/marginalia 2b926ae 190/241: Avoid annotations for host and remote path completions |
Date: |
Fri, 28 May 2021 20:49:24 -0400 (EDT) |
branch: externals/marginalia
commit 2b926ae572a42f5265f699995c19f5a29a02aa58
Author: Clemens Radermacher <clemera@posteo.net>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Avoid annotations for host and remote path completions
---
marginalia.el | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/marginalia.el b/marginalia.el
index 1d3b7fe..94595d8 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -622,19 +622,29 @@ using `minibuffer-force-complete' on the candidate CAND."
;; necessary information (there's not much else we can do)
cand))
+(defun marginalia--remote-p (path)
+ "Return t if PATH is a remote path."
+ (string-match-p "\\`/[^:]+:" path))
+
(defun marginalia-annotate-file (cand)
- "Annotate file CAND with its size, modification time and other attributes."
- (when-let ((attributes (file-attributes (marginalia--full-candidate cand)
'string)))
- (marginalia--fields
- ((file-attribute-modes attributes) :face 'marginalia-file-modes)
- ((format "%s:%s"
- (file-attribute-user-id attributes)
- (file-attribute-group-id attributes))
- :width 12 :face 'marginalia-file-owner)
- ((file-size-human-readable (file-attribute-size attributes)) :width 7
:face 'marginalia-size)
- ((format-time-string
- "%b %d %H:%M"
- (file-attribute-modification-time attributes)) :face
'marginalia-date))))
+ "Annotate file CAND with its size, modification time and other attributes.
+These annotations are skipped for remote paths."
+ (if (or (marginalia--remote-p cand)
+ (when-let (win (active-minibuffer-window))
+ (with-current-buffer (window-buffer win)
+ (marginalia--remote-p (minibuffer-contents-no-properties)))))
+ (marginalia--documentation "*Remote*")
+ (when-let (attributes (file-attributes (marginalia--full-candidate cand)
'string))
+ (marginalia--fields
+ ((file-attribute-modes attributes) :face 'marginalia-file-modes)
+ ((format "%s:%s"
+ (file-attribute-user-id attributes)
+ (file-attribute-group-id attributes))
+ :width 12 :face 'marginalia-file-owner)
+ ((file-size-human-readable (file-attribute-size attributes)) :width 7
:face 'marginalia-size)
+ ((format-time-string
+ "%b %d %H:%M"
+ (file-attribute-modification-time attributes)) :face
'marginalia-date)))))
(defun marginalia-annotate-project-file (cand)
"Annotate file CAND with its size, modification time and other attributes."
- [elpa] externals/marginalia 09aaad9 159/241: Revert "fix #46: affixation suffix must not be nil, it must be a string", (continued)
- [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
- [elpa] externals/marginalia 65da400 055/241: marginalia-annotate-package: show package version, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 501a3b3 056/241: simplify marginalia--align, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 4ffd1a9 071/241: add marginalia-annotate-input-method, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 75e9e9b 070/241: add marginalia-annotate-charset, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia c940a49 236/241: Use more restricted regexp to detect remote completion, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia feca4f1 100/241: add support for project.el, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 65d6b5d 102/241: fix package annotation, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 7df0e53 177/241: Add marginalia-bookmark-type-transformers, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2b926ae 190/241: Avoid annotations for host and remote path completions,
Stefan Monnier <=
- [elpa] externals/marginalia e4b3fcd 191/241: marginalia--remote-p: handle shadow paths, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 3210152 033/241: add comment to marginalia--full-candidate, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia f9ca52c 032/241: Fallback for when full candidate is requested outside of minibuffer, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 6789da8 034/241: fix typo in marginalia-set-command-annotator, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia f39556b 043/241: fix marginalia--full-candidate for selectrum, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia fe5d5db 047/241: add faces: marginalia-file-modes, marginalia-file-owner, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 2eec2dc 060/241: fix warnings, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia d0afe4a 068/241: add melpa badge, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 7394690 078/241: add marginalia-annotate-virtual-buffer for consult-buffer, Stefan Monnier, 2021/05/28
- [elpa] externals/marginalia 091895b 092/241: fix #23, Stefan Monnier, 2021/05/28