From b5093a5e93b1068dbc88fe75ddd3ea618d8ac555 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Wed, 30 Mar 2022 22:50:57 +0200
Subject: [PATCH] fix(doom-dashboard): :key param & keymap precedence

- Fixes the :key property in +doom-dashboard-menu-sections, which
  formerly threw an error.
- When looking up commands in +doom-dashboard-menu-sections, the
  dashboard will now prioritize keys in +doom-dashboard-mode-map.

Close: #6194
Co-authored-by: Gerry Agbobada <gagbo@users.noreply.github.com>
---
 modules/ui/doom-dashboard/config.el | 36 +++++++++++++++++++----------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el
index aceb39d5c..254062ce2 100644
--- a/modules/ui/doom-dashboard/config.el
+++ b/modules/ui/doom-dashboard/config.el
@@ -459,7 +459,7 @@ What it is set to is controlled by `+doom-dashboard-pwd-policy'."
         (all-the-icons-default-adjust -0.02))
     (insert "\n")
     (dolist (section +doom-dashboard-menu-sections)
-      (cl-destructuring-bind (label &key icon action when face) section
+      (cl-destructuring-bind (label &key icon action when face key) section
         (when (and (fboundp action)
                    (or (null when)
                        (eval when t)))
@@ -483,17 +483,29 @@ What it is set to is controlled by `+doom-dashboard-pwd-policy'."
                                  (propertize (symbol-name action) 'face 'doom-dashboard-menu-desc)))
                         (format "%-37s" (buffer-string)))
                       ;; Lookup command keys dynamically
-                      (or (when-let (key (where-is-internal action nil t))
-                            (with-temp-buffer
-                              (save-excursion (insert (key-description key)))
-                              (while (re-search-forward "<\\([^>]+\\)>" nil t)
-                                (let ((str (match-string 1)))
-                                  (replace-match
-                                   (upcase (if (< (length str) 3)
-                                               str
-                                             (substring str 0 3))))))
-                              (propertize (buffer-string) 'face 'doom-dashboard-menu-desc)))
-                          ""))))
+                      (propertize
+                       (or key
+                           (when-let*
+                               ((keymaps
+                                 (delq
+                                  nil (list (when (bound-and-true-p evil-local-mode)
+                                              (evil-get-auxiliary-keymap +doom-dashboard-mode-map 'normal))
+                                            +doom-dashboard-mode-map)))
+                                (key
+                                 (or (when keymaps
+                                       (where-is-internal action keymaps t))
+                                     (where-is-internal action nil t))))
+                             (with-temp-buffer
+                               (save-excursion (insert (key-description key)))
+                               (while (re-search-forward "<\\([^>]+\\)>" nil t)
+                                 (let ((str (match-string 1)))
+                                   (replace-match
+                                    (upcase (if (< (length str) 3)
+                                                str
+                                              (substring str 0 3))))))
+                               (buffer-string)))
+                           "")
+                       'face 'doom-dashboard-menu-desc))))
            (if (display-graphic-p)
                "\n\n"
              "\n")))))))