From 586086889e3c9acb212c517f6b1cab35115a713a Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Fri, 10 May 2019 03:17:15 +0800 Subject: [PATCH] [Feature] Helm mode-line. --- doom-modeline-segments.el | 76 +++++++++++++++++++++++++++++++++++++++ doom-modeline.el | 18 ++++++++-- 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/doom-modeline-segments.el b/doom-modeline-segments.el index 9c4e8d7..8a3f420 100644 --- a/doom-modeline-segments.el +++ b/doom-modeline-segments.el @@ -65,6 +65,7 @@ (defvar flymake--backend-state) (defvar flymake--mode-line-format) (defvar flymake-menu) +(defvar helm--mode-line-display-prefarg) (defvar iedit-occurrences-overlays) (defvar mc/mode-line) (defvar minions-mode-line-lighter) @@ -138,6 +139,8 @@ (declare-function flymake-running-backends 'flymake) (declare-function flymake-show-diagnostics-buffer 'flymake) (declare-function flymake-start 'flymake) +(declare-function helm-candidate-number-at-point 'helm) +(declare-function helm-get-candidate-number 'helm) (declare-function iedit-find-current-occurrence-overlay 'iedit-lib) (declare-function iedit-prev-occurrence 'iedit-lib) (declare-function image-get-display-property 'image-mode) @@ -2112,6 +2115,79 @@ we don't want to remove that so we just return the original." info (propertize info 'face 'mode-line-inactive)))))) + +;; +;; Helm +;; + +(defvar doom-modeline--helm-buffer-ids + '(("*helm*" . "HELM") + ("*helm M-x*" . "HELM M-x") + ("*swiper*" . "SWIPER") + ("*Projectile Perspectives*" . "HELM Projectile Perspectives") + ("*Projectile Layouts*" . "HELM Projectile Layouts") + ("*helm-ag*" . (lambda () + (format "HELM Ag: Using %s" + (car (split-string helm-ag-base-command)))))) + "Alist of custom helm buffer names to use. +The cdr can also be a function that returns a name to use.") +(doom-modeline-def-segment helm-buffer-id + "Helm session identifier." + (when (bound-and-true-p helm-alive-p) + (concat + " " + (propertize + (let ((custom (cdr (assoc (buffer-name) doom-modeline--helm-buffer-ids))) + (case-fold-search t) + (name (replace-regexp-in-string "-" " " (buffer-name)))) + (cond ((stringp custom) custom) + ((functionp custom) (funcall custom)) + (t + (string-match "\\*helm:? \\(mode \\)?\\([^\\*]+\\)\\*" name) + (concat "HELM " (capitalize (match-string 2 name)))))) + 'face 'doom-modeline-buffer-file) + " "))) + +(doom-modeline-def-segment helm-number + "Number of helm candidates." + (when (bound-and-true-p helm-alive-p) + (concat + (propertize (format " %d/%d" + (helm-candidate-number-at-point) + (helm-get-candidate-number t)) + 'face 'doom-modeline-buffer-path) + (propertize (format " (%d total) " (helm-get-candidate-number)) + 'face 'doom-modeline-info)))) + +(doom-modeline-def-segment helm-help + "Helm keybindings help." + (when (bound-and-true-p helm-alive-p) + (-interleave + (mapcar (lambda (s) + (propertize (substitute-command-keys s) 'face 'doom-modeline-buffer-file)) + '("\\\\[helm-help]" + "\\\\[helm-select-action]" + "\\\\[helm-maybe-exit-minibuffer]/F1/F2...")) + '("(help) " "(actions) " "(action) ")))) + +(doom-modeline-def-segment helm-prefix-argument + "Helm prefix argument." + (when (and (bound-and-true-p helm-alive-p) + helm--mode-line-display-prefarg) + (let ((arg (prefix-numeric-value (or prefix-arg current-prefix-arg)))) + (unless (= arg 1) + (propertize (format "C-u %s" arg) 'face 'doom-modeline-info))))) + +(defvar doom-modeline--helm-current-source nil + "The currently active helm source.") +(doom-modeline-def-segment helm-follow + "Helm follow indicator." + (when (and (bound-and-true-p helm-alive-p) + doom-modeline--helm-current-source + (eq 1 (cdr (assq 'follow doom-modeline--helm-current-source)))) + "HF")) + + (provide 'doom-modeline-segments) ;;; doom-modeline-segments.el ends here diff --git a/doom-modeline.el b/doom-modeline.el index 4f88e3e..9d71e4d 100644 --- a/doom-modeline.el +++ b/doom-modeline.el @@ -114,6 +114,10 @@ '(bar window-number buffer-size buffer-info pdf-pages) '(misc-info " " major-mode process vcs)) +(doom-modeline-def-modeline 'helm + '(bar helm-buffer-id helm-number helm-follow helm-prefix-argument) + '(helm-help)) + ;; ;; Interfaces @@ -166,12 +170,18 @@ If DEFAULT is non-nil, set the default mode-line for all buffers." "Set pdf mode-line." (doom-modeline-set-modeline 'pdf)) +;;;###autoload +(defun doom-modeline-set-helm-modeline (&rest _) + "Set helm mode-line." + (doom-modeline-set-modeline 'helm)) + ;; ;; Mode ;; (defvar doom-modeline--default-mode-line mode-line-format) +(declare-function helm-display-mode-line 'helm) ;;;###autoload (define-minor-mode doom-modeline-mode @@ -196,7 +206,9 @@ If DEFAULT is non-nil, set the default mode-line for all buffers." (add-hook 'image-mode-hook #'doom-modeline-set-media-modeline) (add-hook 'circe-mode-hook #'doom-modeline-set-special-modeline) (add-hook 'pdf-tools-enabled-hook #'doom-modeline-set-pdf-modeline) - (add-hook 'paradox-menu-mode-hook #'doom-modeline-set-package-modeline)) + (add-hook 'paradox-menu-mode-hook #'doom-modeline-set-package-modeline) + ;; Add advice + (advice-add #'helm-display-mode-line :override #'doom-modeline-set-helm-modeline)) (progn ;; Restore mode-line (setq-default mode-line-format doom-modeline--default-mode-line) @@ -207,7 +219,9 @@ If DEFAULT is non-nil, set the default mode-line for all buffers." (remove-hook 'image-mode-hook #'doom-modeline-set-media-modeline) (remove-hook 'circe-mode-hook #'doom-modeline-set-special-modeline) (remove-hook 'pdf-tools-enabled-hook #'doom-modeline-set-pdf-modeline) - (remove-hook 'paradox-menu-mode-hook #'doom-modeline-set-package-modeline)))) + (remove-hook 'paradox-menu-mode-hook #'doom-modeline-set-package-modeline) + ;; Remove advices + (advice-remove #'helm-display-mode-line #'doom-modeline-set-helm-modeline)))) (provide 'doom-modeline)