minibuffer-modeline performance improvements

sandhu · Dec 15, 2022 · ffc06d8 · ffc06d8
1 parent 80079eb
commit ffc06d8
Show file tree

Hide file tree

Showing 3 changed files with 127 additions and 82 deletions.
diff --git a/config/005-editing-config.el b/config/005-editing-config.el
@@ -52,7 +52,7 @@
   :bind (("C-." . avy-goto-word-or-subword-1)
          ("C-o" . avy-goto-word-or-subword-1)))
 
-(use-package multiple-cursors :ensure t
+(use-package multiple-cursors :ensure t :pin melpa-stable
   :config (progn
             (setq mc/always-run-for-all t)
             (define-key mc/keymap (kbd "<return>") nil))

diff --git a/config/008-ui-config.el b/config/008-ui-config.el
@@ -4,6 +4,7 @@
   (mouse-wheel-mode t)
   (blink-cursor-mode -1)
   (menu-bar-mode -1)
+  (global-font-lock-mode)
   (desktop-save-mode 1))
 
 (use-package solarized-theme :ensure t
@@ -18,104 +19,147 @@
 
 (use-package projectile :ensure t)
 
+(defvar-local git-project-message nil)
 (defun git-project-message ()
-  (when (cdr (project-current))
-    (concat
-     " ["
-     (file-name-nondirectory (directory-file-name (cdr (project-current))))
-     (unless (and (buffer-file-name) (file-remote-p (buffer-file-name)))
-       (let* ((branch (shell-command-to-string
-                       "git rev-parse --symbolic-full-name --abbrev-ref HEAD 2>/dev/null"))
-              (branch-str (string-trim (replace-regexp-in-string
-                                        "^HEAD" "(DETACHED HEAD)"
-                                        branch))))
-         (unless (= 0 (length branch-str))
-           (propertize (concat "  " branch-str) 'face '((t :foreground "#444444"))))))
-     "]")))
+  (setq git-project-message
+        (when (cdr (project-current))
+          (concat
+           " ["
+           (file-name-nondirectory (directory-file-name (cdr (project-current))))
+           (unless (and (buffer-file-name) (file-remote-p (buffer-file-name)))
+             (let* ((branch (shell-command-to-string
+                             "git rev-parse --symbolic-full-name --abbrev-ref HEAD 2>/dev/null"))
+                    (branch-str (string-trim (replace-regexp-in-string
+                                              "^HEAD" "(DETACHED HEAD)"
+                                              branch))))
+               (unless (= 0 (length branch-str))
+                 (propertize (concat "  " branch-str) 'face '((t :foreground "#444444"))))))
+           "]"))))
 
+(defvar-local git-file-message nil)
 (defun git-file-message ()
-  (when (cdr (project-current))
-    (let* ((diff-str (lambda (cmd)
-                       (let ((diff (shell-command-to-string cmd)))
-                         (when (and diff (string-match "^\\([0-9]+\\)\t\\([0-9]+\\)\t" diff))
-                           (concat
-                            (propertize (format "+%s"  (match-string 1 diff)) 'face '((t :foreground "green4")))
-                            (propertize (format " -%s" (match-string 2 diff)) 'face '((t :foreground "red4"))))))))
-           (unstaged (funcall diff-str (concat "git diff --numstat -- " (buffer-file-name))))
-           (staged   (funcall diff-str (concat "git diff --cached --numstat -- " (buffer-file-name)))))
-      (when (or unstaged staged)
-        (concat " ["
-                unstaged
-                (when staged (concat (when unstaged " ") "✓ "))
-                staged
-                "]")))))
+  (setq git-file-message
+        (when (cdr (project-current))
+          (let* ((diff-str (lambda (cmd)
+                             (let ((diff (shell-command-to-string cmd)))
+                               (when (and diff (string-match "^\\([0-9]+\\)\t\\([0-9]+\\)\t" diff))
+                                 (concat
+                                  (propertize (format "+%s"  (match-string 1 diff)) 'face '((t :foreground "green4")))
+                                  (propertize (format " -%s" (match-string 2 diff)) 'face '((t :foreground "red4"))))))))
+                 (unstaged (funcall diff-str (concat "git diff --numstat -- " (buffer-file-name))))
+                 (staged   (funcall diff-str (concat "git diff --cached --numstat -- " (buffer-file-name)))))
+            (when (or unstaged staged)
+              (concat " ["
+                      unstaged
+                      (when staged (concat (when unstaged " ") "✓ "))
+                      staged
+                      "]"))))))
 
+(defvar-local file-directory-message nil)
 (defun file-directory-message ()
-  (propertize
-   (if (and (buffer-file-name) (cdr (project-current)))
-       (replace-regexp-in-string
-        (concat "^" (cdr (project-current))) ""
-        default-directory)
-     (when (buffer-file-name)
-       (replace-regexp-in-string
-        (concat "^" (expand-file-name "~")) "~"
-        default-directory)))
-   'face font-lock-variable-name-face))
+  (setq file-directory-message
+        (propertize
+         (or (if (and (buffer-file-name) (cdr (project-current)))
+                 (replace-regexp-in-string
+                  (concat "^" (cdr (project-current))) ""
+                  default-directory)
+               (when (buffer-file-name)
+                 (replace-regexp-in-string
+                  (concat "^" (expand-file-name "~")) "~"
+                  default-directory)))
+             "")
+         'face 'font-lock-keyword-face)))
 
+(defvar-local file-or-buffer-message nil)
 (defun file-or-buffer-message ()
-  (concat
-   (propertize
-    (if (buffer-file-name)
-        (file-name-nondirectory (buffer-file-name))
-      (concat " " (buffer-name)))
-    'face font-lock-keyword-face)
-   (when (and (buffer-file-name) (buffer-modified-p))
-     (propertize "•" 'face font-lock-warning-face))))
+  (setq file-or-buffer-message
+        (propertize
+         (if (buffer-file-name)
+             (file-name-nondirectory (buffer-file-name))
+           (concat " " (buffer-name)))
+         'face 'font-lock-variable-name-face)))
+
+(defvar-local file-save-status-message nil)
+(defun file-save-status-message ()
+  (setq file-save-status-message
+        (when (and (buffer-file-name) (buffer-modified-p))
+          (propertize "•" 'face font-lock-warning-face))))
 
 (use-package flycheck :ensure t)
 
-(defun flycheck-message ()
-  (when (and flycheck-mode flycheck-current-errors)
-    (let-alist (flycheck-count-errors flycheck-current-errors)
-      (when (or .error .warning)
+(defvar-local flycheck-message nil)
+
+(defvar-local line-column-info nil)
+(defun line-column-info ()
+  (setq line-column-info
+        (format "%5s:%-3s" (line-number-at-pos) (current-column))))
+
+(defun update-minibuffer-modeline ()
+  (unless (current-message)
+    (let ((minibuf " *Minibuf-0*"))
+      (let ((left (concat
+                   git-project-message " "
+                   file-directory-message
+                   file-or-buffer-message
+                   file-save-status-message
+                   git-file-message " "
+                   flycheck-message))
+            (right (concat
+                    line-column-info " ")))
+        (with-current-buffer minibuf
+          (erase-buffer)
+          (let* ((message-truncate-lines t)
+                 (max-mini-window-height 1)
+                 (free-space (- (frame-width) (length left) (length right)))
+                 (padding (make-string (max 0 free-space) ?\ )))
+            (insert (concat left (when right (concat padding right))))))))))
+
+(defun update-flycheck-message (&optional status)
+  (setq flycheck-message
         (concat
          "[»"
-         (propertize (format " %s" (or .error 0)) 'face (when .error 'error))
-         (propertize (format " %s" (or .warning 0)) 'face (when .warning 'warning))
-         "]")))))
+         (pcase status
+           ('finished (if flycheck-current-errors
+                          (let-alist (flycheck-count-errors flycheck-current-errors)
+                            (when (or .error .warning .info)
+                              (concat
+                               (propertize (format " %s" (or .error 0)) 'face (when .error 'error))
+                               (propertize (format " %s" (or .warning 0)) 'face (when .warning 'warning))
+                               (propertize (format " %s" (or .info 0)) 'face (when .info 'info)))))
+                        (propertize " ✓" 'face 'success)))
+           ('running (propertize " ⋯" 'face 'info))
+           ('errored (propertize " ⚠" 'face 'error))
+           ('interrupted (propertize " ⏸" 'face 'fringe))
+           ('no-checker ""))
+         "]"))
+  (update-minibuffer-modeline))
 
-(defun line-column-info ()
-  (format "%5s:%-2s" (line-number-at-pos) (current-column)))
+(defun handle-cursor-move ()
+  (line-column-info)
+  (file-save-status-message)
+  (update-minibuffer-modeline))
+
+(defun handle-file-save ()
+  (git-project-message)
+  (file-directory-message)
+  (file-or-buffer-message)
+  (file-save-status-message)
+  (git-file-message)
+  (update-minibuffer-modeline))
 
 (defun setup-minibuffer-modeline ()
   (setq window-divider-default-bottom-width 1
         window-divider-default-places (quote bottom-only))
   (window-divider-mode 1)
   (setq-default mode-line-format nil)
-  (walk-windows (lambda (window) (with-selected-window window (setq mode-line-format nil))) nil t))
+  (walk-windows (lambda (window) (with-selected-window window (setq mode-line-format nil))) nil t)
+  (handle-file-save)
+  (handle-cursor-move))
 
-(defun update-minibuffer-modeline ()
-  (let ((minibuf " *Minibuf-0*"))
-    (unless (current-message)
-      (condition-case err
-          (let ((left (concat
-                       (git-project-message) " "
-                       (file-directory-message)
-                       (file-or-buffer-message)
-                       (git-file-message) " "
-                       (flycheck-message)))
-                (right (concat
-                        (line-column-info) " ")))
-            (with-current-buffer minibuf
-              (erase-buffer)
-              (let* ((message-truncate-lines t)
-                     (max-mini-window-height 1)
-                     (free-space (- (frame-width) (length left) (length right)))
-                     (padding (make-string (max 0 free-space) ?\ )))
-                (insert (concat left (if right (concat padding right)))))))
-        (error nil)))))
-
-(setup-minibuffer-modeline)
-(update-minibuffer-modeline)
-
-(add-hook 'post-command-hook 'update-minibuffer-modeline)
+(add-hook 'post-command-hook 'handle-cursor-move)
+(add-hook 'after-save-hook 'handle-file-save)
+
+(add-hook 'flycheck-status-changed-functions #'update-flycheck-message)
+(add-hook 'flycheck-mode-hook #'update-flycheck-message)
+
+(add-hook 'window-configuration-change-hook 'setup-minibuffer-modeline)
diff --git a/config/111-lisp-config.el b/config/111-lisp-config.el
@@ -1,5 +1,6 @@
 (global-prettify-symbols-mode +1)
 (global-eldoc-mode -1)
+(eldoc-mode -1)
 
 (use-package paredit :ensure t
   :config (progn (defun conditionally-enable-paredit-mode ()