From 9233fdce744abda14aa14ae86bc3541afa04a164 Mon Sep 17 00:00:00 2001
From: Jessie Hildebrandt <jessieh@jessieh.net>
Date: Thu, 29 Dec 2022 09:00:52 -0500
Subject: [PATCH] Tweak formatting of indentation segment

---
 mood-line-segment-indentation.el | 58 ++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/mood-line-segment-indentation.el b/mood-line-segment-indentation.el
index dda97f0..b2e8bff 100644
--- a/mood-line-segment-indentation.el
+++ b/mood-line-segment-indentation.el
@@ -29,6 +29,18 @@
 
 ;;; Code:
 
+;; -------------------------------------------------------------------------- ;;
+;;
+;; Byte-compiler declarations
+;;
+;; -------------------------------------------------------------------------- ;;
+
+;; ---------------------------------- ;;
+;; External function decls
+;; ---------------------------------- ;;
+
+(declare-function mood-line--get-glyph "mood-line" (glyph))
+
 ;; -------------------------------------------------------------------------- ;;
 ;;
 ;; Custom definitions
@@ -39,6 +51,20 @@
 ;; Variable definitions
 ;; ---------------------------------- ;;
 
+(defcustom mood-line-segment-indentation-always-show-offset nil
+  "When non-nil, always show the indentation offset of the current mode.
+
+Default behavior of the indentation segment is to display the indentation offset
+of the current mode when `indent-tabs-mode' is non-nil and an offset value can
+be found for the current mode.  Otherwise, `tab-wdith' will be shown.
+
+When `mood-line-segment-indentation-always-show-offset' is set to non-nil, the
+indentation offset will always be shown alongside `tab-width'.  If an offset
+value cannot be found for the current mode, a \"?\" character will be displayed
+alongside `tab-width'."
+  :group 'mood-line
+  :type 'boolean)
+
 ;; Assembled from `editorconfig-indentation-alist' and `doom-modeline-indent-alist':
 ;; https://github.com/editorconfig/editorconfig-emacs/blob/b8043702f3d977db0e030c6c64ee4a810cad5f45/editorconfig.el#L175
 ;; https://github.com/seagle0128/doom-modeline/blob/fe9ee5a2a950f9ded10261a05a12adc577ae9e36/doom-modeline-core.el#L284
@@ -164,23 +190,21 @@ order provided)."
 
 (defun mood-line-segment-indentation--segment ()
   "Display the indentation style of the current buffer."
-  (format "%s %s %d  "
-          (if indent-tabs-mode "TAB" "SPC")
-          (let ((lookup-var
-                 (seq-find (lambda (var) (and var (boundp var)))
-                           (cdr (assoc major-mode
-                                       mood-line-segment-indentation-mode-offset-alist))
-                           nil)))
-            ;; If we don't know the indent offset variable of this major mode,
-            ;; display a "-".
-            (if lookup-var
-                ;; Some major modes, for example lisp-mode, works better when
-                ;; lisp-indent-offset is nil, we use "-" for nil, too.
-                (if (not (null (symbol-value lookup-var)))
-                    (format "%d" (symbol-value lookup-var))
-                  "-")
-              "-"))
-          tab-width))
+  (let* ((mode-offset (symbol-value
+                       (seq-some #'identity
+                                 (cdr (assoc major-mode
+                                             mood-line-segment-indentation-mode-offset-alist))))))
+    (propertize (concat (if indent-tabs-mode "TAB" "SPC")
+                        (mood-line--get-glyph :count-separator)
+                        (if mood-line-segment-indentation-always-show-offset
+                            (format "%s:%d"
+                                    (or mode-offset "?")
+                                    tab-width)
+                          (number-to-string (if indent-tabs-mode
+                                                tab-width
+                                              (or mode-offset tab-width))))
+                        "  ")
+                'face 'mood-line-unimportant)))
 
 ;; -------------------------------------------------------------------------- ;;
 ;;