[elpa] externals/marginalia d2a7923 069/241: improve marginalia-annotate-package, do not show nil for builtins

[Stefan Monnier]

branch: externals/marginalia
commit d2a79234c5873e7ab2b90f6cf7bddbdd61f2a9a5
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    improve marginalia-annotate-package, do not show nil for builtins
---
 marginalia.el | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/marginalia.el b/marginalia.el
index 5457914..2f7bc8f 100644
--- a/marginalia.el
+++ b/marginalia.el
@@ -85,10 +85,15 @@
   :group 'marginalia)
 
 (defface marginalia-archive
-  '((t :inherit marginalia-key))
+  '((t :inherit warning))
   "Face used to highlight package archives in `marginalia-mode'."
   :group 'marginalia)
 
+(defface marginalia-installed
+  '((t :inherit success))
+  "Face used to highlight package status in `marginalia-mode'."
+  :group 'marginalia)
+
 (defface marginalia-size
   '((t :inherit font-lock-constant-face))
   "Face used to highlight sizes in `marginalia-mode'."
@@ -197,12 +202,13 @@ determine it."
 (defvar package--builtins)
 (defvar package-alist)
 (defvar package-archive-contents)
+(declare-function package--from-builtin "package")
+(declare-function package-desc-archive "package")
+(declare-function package-desc-dir "package")
 (declare-function package-desc-summary "package")
 (declare-function package-desc-version "package")
-(declare-function package-desc-archive "package")
 (declare-function package-installed-p "package")
 (declare-function package-version-join "package")
-(declare-function package--from-builtin "package")
 
 ;;;; Marginalia mode
 
@@ -335,9 +341,10 @@ This hash table is needed to speed up 
`marginalia-annotate-command-binding'.")
                           (car (alist-get pkg package-archive-contents))))))
     (marginalia--fields
      ((package-version-join (package-desc-version desc)) :width 16 :face 
'marginalia-version)
-     ((if (package-installed-p desc)
-          "installed"
-        (package-desc-archive desc)) :width 9 :face 'marginalia-archive)
+     ((cond
+       ((eq (package-desc-dir desc) 'builtin) (propertize "builtin" 'face 
'marginalia-installed))
+       ((package-installed-p desc) (propertize "installed" 'face 
'marginalia-installed))
+       (t (propertize (package-desc-archive desc) 'face 'marginalia-archive))) 
:width 9)
      ((package-desc-summary desc) :truncate marginalia-truncate-width :face 
'marginalia-documentation))))
 
 (defun marginalia-annotate-customize-group (cand)