Skip to content

Commit

Permalink
Revert "Add support for display icons in check-simple-format (#706)"
Browse files Browse the repository at this point in the history 
This reverts commit 798d8b9.
  • Loading branch information
@seagle0128
seagle0128 committed Mar 24, 2024
1 parent 3098762 commit 2e420e6
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 89 deletions.
7 changes: 0 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,15 +294,8 @@ Run `M-x customize-group RET doom-modeline RET` or set the variables.
(setq doom-modeline-total-line-number nil)
;; If non-nil, only display one number for check information if applicable.
;; If set to icons, display check information with icons.
(setq doom-modeline-check-simple-format t)
;; Change error icons.
;; Only if doom-modeline-check-simple-format is set to icons
(setq doom-modeline-check-error-icon "⛔")
(setq doom-modeline-check-warning-icon "❌")
(setq doom-modeline-check-note-icon "❎")
;; The maximum number displayed for notifications.
(setq doom-modeline-number-limit 99)
Expand Down
6 changes: 2 additions & 4 deletions doom-modeline-core.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,10 +474,8 @@ in the given order."
"4.2.0")

(defcustom doom-modeline-check-simple-format t
"If non-nil, only display one number for check information if applicable.
If set to icons, display check information with icons."
:type '(choice boolean
(const :tag "simple icons" icons))
"If non-nil, only display one number for check information if applicable."
:type 'boolean
:group 'doom-modeline)

(defcustom doom-modeline-number-limit 99
Expand Down
110 changes: 32 additions & 78 deletions doom-modeline-segments.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,30 +109,6 @@
(defvar winum-auto-setup-mode-line)
(defvar xah-fly-insert-state-p)

(defcustom doom-modeline-check-error-icon
(doom-modeline-check-icon
"nf-md-alert_circle_outline" "❗" "!" 'doom-modeline-urgent)
"Icon to be using in check segment.
Only works if `doom-modeline-check-simple-format' is set to icons."
:type '(string)
:group 'doom-modeline)

(defcustom doom-modeline-check-warning-icon
(doom-modeline-check-icon
"nf-md-alert_outline" "⚠" "!" 'doom-modeline-warning)
"Icon to be using in check segment.
Only works if `doom-modeline-check-simple-format' is set to icons."
:type '(string)
:group 'doom-modeline)

(defcustom doom-modeline-check-note-icon
(doom-modeline-check-icon
"nf-md-information_outline" "❔" "i" 'doom-modeline-info)
"Icon to be using in check segment.
Only works if `doom-modeline-check-simple-format' is set to icons."
:type '(string)
:group 'doom-modeline)

(declare-function anzu--reset-status "ext:anzu")
(declare-function anzu--where-is-here "ext:anzu")
(declare-function async-inject-variables "ext:async")
Expand Down Expand Up @@ -807,13 +783,11 @@ level."
(pcase status
('finished (if flycheck-current-errors
(let-alist (doom-modeline--flycheck-count-errors)
(if (not (eq doom-modeline-check-simple-format 'icons))
(doom-modeline-check-icon
"nf-md-alert_circle_outline" "❗" "!"
(cond ((> .error 0) 'doom-modeline-urgent)
((> .warning 0) 'doom-modeline-warning)
(t 'doom-modeline-info)))
doom-modeline-check-error-icon))
(doom-modeline-check-icon
"nf-md-alert_circle_outline" "❗" "!"
(cond ((> .error 0) 'doom-modeline-urgent)
((> .warning 0) 'doom-modeline-warning)
(t 'doom-modeline-info))))
(doom-modeline-check-icon "nf-md-check_circle_outline" "✔" "" 'doom-modeline-info)))
('running (doom-modeline-check-icon "nf-md-timer_sand" "⏳" "*" 'doom-modeline-debug))
('no-checker (doom-modeline-check-icon "nf-md-alert_box_outline" "⚠" "-" 'doom-modeline-debug))
Expand Down Expand Up @@ -872,28 +846,19 @@ mouse-2: Show help for minor mode")
(pcase status
('finished (when flycheck-current-errors
(let-alist (doom-modeline--flycheck-count-errors)
(pcase doom-modeline-check-simple-format
('t (doom-modeline-check-text
(number-to-string (+ .error .warning .info))
(cond ((> .error 0) 'doom-modeline-urgent)
((> .warning 0) 'doom-modeline-warning)
(t 'doom-modeline-info))))
('nil (format "%s/%s/%s"
(doom-modeline-check-text (number-to-string .error)
'doom-modeline-urgent)
(doom-modeline-check-text (number-to-string .warning)
'doom-modeline-warning)
(doom-modeline-check-text (number-to-string .info)
'doom-modeline-info)))
('icons (format "%s %s %s %s %s"
(doom-modeline-check-text (number-to-string .error)
'doom-modeline-urgent)
doom-modeline-check-warning-icon
(doom-modeline-check-text (number-to-string .warning)
'doom-modeline-warning)
doom-modeline-check-note-icon
(doom-modeline-check-text (number-to-string .info)
'doom-modeline-info)))))))
(if doom-modeline-check-simple-format
(doom-modeline-check-text
(number-to-string (+ .error .warning .info))
(cond ((> .error 0) 'doom-modeline-urgent)
((> .warning 0) 'doom-modeline-warning)
(t 'doom-modeline-info)))
(format "%s/%s/%s"
(doom-modeline-check-text (number-to-string .error)
'doom-modeline-urgent)
(doom-modeline-check-text (number-to-string .warning)
'doom-modeline-warning)
(doom-modeline-check-text (number-to-string .info)
'doom-modeline-info))))))
('running (and doom-modeline--flycheck-text
(propertize doom-modeline--flycheck-text 'face 'doom-modeline-debug)))
;; ('no-checker nil)
Expand Down Expand Up @@ -993,12 +958,10 @@ mouse-3: Next error"
((> severity note-level) (cl-incf .warning))
(t (cl-incf .note))))))
(if (> (+ .error .warning .note) 0)
(if (not (eq doom-modeline-check-simple-format 'icons))
(doom-modeline-check-icon "nf-md-alert_circle_outline" "❗" "!"
(cond ((> .error 0) 'doom-modeline-urgent)
((> .warning 0) 'doom-modeline-warning)
(t 'doom-modeline-info)))
(doom-modeline-check-icon "nf-md-alert_circle_outline" "❗" "!" 'doom-modeline-urgent))
(doom-modeline-check-icon "nf-md-alert_circle_outline" "❗" "!"
(cond ((> .error 0) 'doom-modeline-urgent)
((> .warning 0) 'doom-modeline-warning)
(t 'doom-modeline-info)))
(doom-modeline-check-icon "nf-md-check_circle_outline" "✔" "-" 'doom-modeline-info))))))))
(propertize
icon
Expand Down Expand Up @@ -1076,27 +1039,18 @@ mouse-2: Show help for minor mode"
(all-disabled nil)
(t (let ((num (+ .error .warning .note)))
(when (> num 0)
(pcase doom-modeline-check-simple-format
('t (doom-modeline-check-text (number-to-string num)
(if doom-modeline-check-simple-format
(doom-modeline-check-text (number-to-string num)
(cond ((> .error 0) 'doom-modeline-urgent)
((> .warning 0) 'doom-modeline-warning)
(t 'doom-modeline-info))))
('nil (format "%s/%s/%s"
(doom-modeline-check-text (number-to-string .error)
'doom-modeline-urgent)
(doom-modeline-check-text (number-to-string .warning)
'doom-modeline-warning)
(doom-modeline-check-text (number-to-string .note)
'doom-modeline-info)))
('icons (format "%s %s %s %s %s"
(doom-modeline-check-text (number-to-string .error)
'doom-modeline-urgent)
doom-modeline-check-warning-icon
(doom-modeline-check-text (number-to-string .warning)
'doom-modeline-warning)
doom-modeline-check-note-icon
(doom-modeline-check-text (number-to-string .note)
'doom-modeline-info))))))))))
(t 'doom-modeline-info)))
(format "%s/%s/%s"
(doom-modeline-check-text (number-to-string .error)
'doom-modeline-urgent)
(doom-modeline-check-text (number-to-string .warning)
'doom-modeline-warning)
(doom-modeline-check-text (number-to-string .note)
'doom-modeline-info)))))))))
(propertize
text
'help-echo (cond
Expand Down

0 comments on commit 2e420e6

Please sign in to comment.