github/doom-modeline
1
0
Fork 0
mirror of https://github.com/correl/doom-modeline.git synced 2024-11-27 11:09:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Enhancement] Show error/warning/info for checkers.

Browse source
This commit is contained in:
Vincent Zhang 2019-01-03 03:31:11 +08:00
parent 1777f1e6ac
commit 3535b96f8a
1 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
doom-modeline.el
View file

@ -1081,7 +1081,9 @@ Uses `all-the-icons-material' to fetch the icon."
(`finished (if flycheck-current-errors (`finished (if flycheck-current-errors
(let-alist (flycheck-count-errors flycheck-current-errors) (let-alist (flycheck-count-errors flycheck-current-errors)
(doom-modeline-checker-icon "do_not_disturb_alt" (doom-modeline-checker-icon "do_not_disturb_alt"
(if .error 'doom-modeline-urgent 'doom-modeline-warning))) (cond (.error 'doom-modeline-urgent)
(.warning 'doom-modeline-warning)
(t 'doom-modeline-info))))
(doom-modeline-checker-icon "check" 'doom-modeline-info))) (doom-modeline-checker-icon "check" 'doom-modeline-info)))
(`running (doom-modeline-checker-icon "access_time" 'font-lock-doc-face)) (`running (doom-modeline-checker-icon "access_time" 'font-lock-doc-face))
(`no-checker (doom-modeline-checker-icon "sim_card_alert" 'font-lock-doc-face)) (`no-checker (doom-modeline-checker-icon "sim_card_alert" 'font-lock-doc-face))
@ -1119,11 +1121,16 @@ mouse-2: Show help for minor mode")
(pcase status (pcase status
(`finished (if flycheck-current-errors (`finished (if flycheck-current-errors
(let-alist (flycheck-count-errors flycheck-current-errors) (let-alist (flycheck-count-errors flycheck-current-errors)
(let ((sum (+ (or .error 0) (or .warning 0)))) (let ((error (or .error 0))
(doom-modeline-checker-text (number-to-string sum) (warning (or .warning 0))
(if .error (info (or .info 0)))
'doom-modeline-urgent (format "%s/%s/%s"
'doom-modeline-warning)))) (doom-modeline-checker-text (number-to-string error)
'doom-modeline-urgent)
(doom-modeline-checker-text (number-to-string warning)
'doom-modeline-warning)
(doom-modeline-checker-text (number-to-string info)
'doom-modeline-info))))
"")) ""))
(`running "") (`running "")
(`no-checker (doom-modeline-checker-text "-" 'font-lock-doc-face)) (`no-checker (doom-modeline-checker-text "-" 'font-lock-doc-face))
@ -1136,10 +1143,10 @@ mouse-2: Show help for minor mode")
(concat (concat
(if flycheck-current-errors (if flycheck-current-errors
(let-alist (flycheck-count-errors flycheck-current-errors) (let-alist (flycheck-count-errors flycheck-current-errors)
(format "error: %d, warning: %d\n" (or .error 0) (or .warning 0)))) (format "error: %d, warning: %d, info: %d\n" (or .error 0) (or .warning 0) (or .info 0))))
"mouse-1: Display warnings and errors "mouse-1: Show all errors
mouse-3: Next warning or error mouse-3: Next error
wheel-up/wheel-down: Previous/Next warning or error")) wheel-up/wheel-down: Previous/next error"))
('running "Running...") ('running "Running...")
('no-checker "No Checker") ('no-checker "No Checker")
('errored "Error") ('errored "Error")
@ -1194,12 +1201,13 @@ wheel-up/wheel-down: Previous/Next warning or error"))
((null known) (doom-modeline-checker-icon "sim_card_alert" 'font-lock-doc-face)) ((null known) (doom-modeline-checker-icon "sim_card_alert" 'font-lock-doc-face))
(all-disabled (doom-modeline-checker-icon "sim_card_alert" 'doom-modeline-urgent)) (all-disabled (doom-modeline-checker-icon "sim_card_alert" 'doom-modeline-urgent))
(t (let ((.error (length (gethash :error diags-by-type))) (t (let ((.error (length (gethash :error diags-by-type)))
(.warning (length (gethash :warning diags-by-type)))) (.warning (length (gethash :warning diags-by-type)))
(if (> (+ .error .warning) 0) (.note (length (gethash :note diags-by-type))))
(if (> (+ .error .warning .note) 0)
(doom-modeline-checker-icon "do_not_disturb_alt" (doom-modeline-checker-icon "do_not_disturb_alt"
(if (> .error 0) (cond ((> .error 0) 'doom-modeline-urgent)
'doom-modeline-urgent ((> .warning 0) 'doom-modeline-warning)
'doom-modeline-warning)) (t 'doom-modeline-info)))
(doom-modeline-checker-icon "check" 'doom-modeline-info))))) (doom-modeline-checker-icon "check" 'doom-modeline-info)))))
'help-echo (concat "Flymake\n" 'help-echo (concat "Flymake\n"
(cond (cond
@ -1248,20 +1256,22 @@ mouse-2: Show help for minor mode"
(some-waiting "Running..." "") (some-waiting "Running..." "")
((null known) (doom-modeline-checker-text "-" 'font-lock-doc-face)) ((null known) (doom-modeline-checker-text "-" 'font-lock-doc-face))
(all-disabled (doom-modeline-checker-text "-" 'doom-modeline-urgent)) (all-disabled (doom-modeline-checker-text "-" 'doom-modeline-urgent))
(t (let ((sum (+ .error .warning))) (t (if (> (+ .error .warning .note) 0)
(if (> sum 0) (format "%s/%s/%s"
(doom-modeline-checker-text (number-to-string sum) (doom-modeline-checker-text (number-to-string .error)
(if (> .error 0) 'doom-modeline-urgent)
'doom-modeline-urgent (doom-modeline-checker-text (number-to-string .warning)
'doom-modeline-warning)) 'doom-modeline-warning)
"")))) (doom-modeline-checker-text (number-to-string .note)
'doom-modeline-info))
"")))
'help-echo (cond 'help-echo (cond
(some-waiting "Running...") (some-waiting "Running...")
((null known) "No Checker") ((null known) "No Checker")
(all-disabled "All Checkers Disabled") (all-disabled "All Checkers Disabled")
(t (format "error: %d, warning: %d, note: %d (t (format "error: %d, warning: %d, note: %d
mouse-1: Display warnings and errors mouse-1: List all problems
wheel-up/wheel-down: Previous/Next warning or error" wheel-up/wheel-down: Previous/next problem"
.error .warning .note))) .error .warning .note)))
'mouse-face 'mode-line-highlight 'mouse-face 'mode-line-highlight
'local-map (let ((map (make-sparse-keymap))) 'local-map (let ((map (make-sparse-keymap)))
@ -1272,13 +1282,13 @@ wheel-up/wheel-down: Previous/Next warning or error"
(lambda (event) (lambda (event)
(interactive "e") (interactive "e")
(with-selected-window (posn-window (event-start event)) (with-selected-window (posn-window (event-start event))
(flymake-goto-prev-error 1 '(:error :warning) t)))) (flymake-goto-prev-error 1 nil t))))
(define-key map (vector 'mode-line (define-key map (vector 'mode-line
mouse-wheel-up-event) mouse-wheel-up-event)
(lambda (event) (lambda (event)
(interactive "e") (interactive "e")
(with-selected-window (posn-window (event-start event)) (with-selected-window (posn-window (event-start event))
(flymake-goto-next-error 1 '(:error :warning) t)))) (flymake-goto-next-error 1 nil t))))
map)))))) map))))))
(advice-add #'flymake--handle-report :after #'doom-modeline-update-flymake-text) (advice-add #'flymake--handle-report :after #'doom-modeline-update-flymake-text)