[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/marginalia e18b4f7 1/2: Coloured file attributes (#91)

From: ELPA Syncer
Subject: [elpa] externals/marginalia e18b4f7 1/2: Coloured file attributes (#91)
Date: Mon, 26 Jul 2021 07:57:13 -0400 (EDT)

branch: externals/marginalia
commit e18b4f7b0bffd415652ac725ecc7a8ec947c2512
Author: tecosaur <tec@tecosaur.com>
Commit: GitHub <noreply@github.com>

    Coloured file attributes (#91)
    * Fontify file attribute annotations
    Using the same scheme as diredfl.
    * Only show user/group when not the current user
    Check the file owner against `user-login-name' and the group against the
    emacs process owner's group, and only show when different.
 marginalia.el | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 66 insertions(+), 5 deletions(-)

diff --git a/marginalia.el b/marginalia.el
index f45e67a..84b25e8 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -234,6 +234,38 @@ determine it."
   '((t :inherit font-lock-preprocessor-face))
   "Face used to highlight file owners in `marginalia-mode'.")
+(defface marginalia-file-priv-no
+  '((t :inherit shadow))
+  "Face used to highlight the no privilege attribute in `marginalia-mode'.")
+(defface marginalia-file-priv-dir
+  '((t :inherit font-lock-keyword-face))
+  "Face used to highlight the dir privilege attribute in `marginalia-mode'.")
+(defface marginalia-file-priv-link
+  '((t :inherit font-lock-keyword-face))
+  "Face used to highlight the link privilege attribute in `marginalia-mode'.")
+(defface marginalia-file-priv-read
+  '((t :inherit font-lock-type-face))
+  "Face used to highlight the read privilege attribute in `marginalia-mode'.")
+(defface marginalia-file-priv-write
+  '((t :inherit font-lock-builtin-face))
+  "Face used to highlight the write privilege attribute in `marginalia-mode'.")
+(defface marginalia-file-priv-exec
+  '((t :inherit font-lock-function-name-face))
+  "Face used to highlight the exec privilege attribute in `marginalia-mode'.")
+(defface marginalia-file-priv-other
+  '((t :inherit font-lock-constant-face))
+  "Face used to highlight some other privilege attribute in 
+(defface marginalia-file-priv-rare
+  '((t :inherit font-lock-variable-name-face))
+  "Face used to highlight a rare privilege attribute in `marginalia-mode'.")
 ;;;; Pre-declarations for external packages
 (defvar bookmark-alist)
@@ -728,18 +760,47 @@ 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-candidate cand)) 'string))
+    (when-let (attributes (file-attributes (substitute-in-file-name 
(marginalia--full-candidate cand)) 'integer))
-       ((file-attribute-modes attributes) :face 'marginalia-file-modes)
-       ((format "%s:%s"
-                (file-attribute-user-id attributes)
-                (file-attribute-group-id attributes))
+       ((let ((uid (file-attribute-user-id attributes))
+              (gid (file-attribute-group-id attributes)))
+          (concat (unless (= (user-id) uid)
+                    (or (user-login-name uid) (number-to-string uid)))
+                  (unless (= (group-gid) gid)
+                    (concat ":" (or (group-name gid) (number-to-string 
         :width 12 :face 'marginalia-file-owner)
+       ((marginalia--color-file-attributes (file-attribute-modes attributes)))
        ((file-size-human-readable (file-attribute-size attributes)) :width 7 
:face 'marginalia-size)
          "%b %d %H:%M"
          (file-attribute-modification-time attributes)) :face 
+(defvar marginalia--color-file-attributes-cache nil
+  "Alist of (attrs . fontified-attrs).")
+(defun marginalia--color-file-attributes (attrs)
+  "Apply fontification to a file attribute string, e.g. \"drwxrw-r--\"."
+  ;; Without caching this can a be significant portion of the time
+  ;; `marginalia-annotate-file' takes to execute. Caching improves performance
+  ;; by about a factor of 20.
+  (or (cdr (assoc attrs marginalia--color-file-attributes-cache))
+      (cdar (push (cons (copy-sequence attrs) ; copy because attrs is about to 
be modified
+                        (progn
+                          (dotimes (char (length attrs))
+                            (put-text-property char (1+ char)
+                                               'face (pcase (aref attrs char)
+                                                       (?- 
+                                                       (?d 
+                                                       (?l 
+                                                       (?r 
+                                                       (?w 
+                                                       (?x 
+                                                       ((or ?s ?S ?t ?T) 
+                                                       (_ 
+                                               attrs))
+                          attrs))
+                  marginalia--color-file-attributes-cache))))
 (defmacro marginalia--project-root ()
   "Return project root."
   (require 'project)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]