diff options
| -rw-r--r-- | modules/modeline-config.el | 11 | ||||
| -rw-r--r-- | modules/ui-config.el | 13 | ||||
| -rw-r--r-- | modules/user-constants.el | 7 | ||||
| -rw-r--r-- | tests/test-ui-buffer-status-colors.el | 221 |
4 files changed, 240 insertions, 12 deletions
diff --git a/modules/modeline-config.el b/modules/modeline-config.el index f2b80561..a5e23dd0 100644 --- a/modules/modeline-config.el +++ b/modules/modeline-config.el @@ -56,9 +56,10 @@ Example: `my-very-long-name.el' → `my-ver...me.el'" (defvar-local cj/modeline-buffer-name '(:eval (let* ((state (cond - (buffer-read-only 'read-only) - (overwrite-mode 'overwrite) - (t 'normal))) + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified))) (color (alist-get state cj/buffer-status-colors)) (name (buffer-name)) (truncated-name (cj/modeline-string-cut-middle name))) @@ -73,8 +74,8 @@ Example: `my-very-long-name.el' → `my-ver...me.el'" (define-key map [mode-line mouse-1] 'previous-buffer) (define-key map [mode-line mouse-3] 'next-buffer) map)))) - "Buffer name colored by read-only/read-write status. -Green = writeable, Red = read-only, Gold = overwrite. + "Buffer name colored by modification and read-only status. +White = unmodified, Green = modified, Red = read-only, Gold = overwrite. Truncates in narrow windows. Click to switch buffers.") (defvar-local cj/modeline-position diff --git a/modules/ui-config.el b/modules/ui-config.el index 3922ce2a..3e065370 100644 --- a/modules/ui-config.el +++ b/modules/ui-config.el @@ -97,11 +97,12 @@ When `cj/enable-transparency' is nil, reset alpha to fully opaque." "Last buffer name where cursor color was applied.") (defun cj/set-cursor-color-according-to-mode () - "Change cursor color according to \\='buffer-read-only or \\='overwrite state." + "Change cursor color according to buffer state (modified, read-only, overwrite)." (let* ((state (cond - (buffer-read-only 'read-only) - (overwrite-mode 'overwrite) - (t 'normal))) + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified))) (color (alist-get state cj/buffer-status-colors))) (unless (and (string= color cj/-cursor-last-color) (string= (buffer-name) cj/-cursor-last-buffer)) @@ -114,6 +115,10 @@ When `cj/enable-transparency' is nil, reset alpha to fully opaque." (lambda (_window) (cj/set-cursor-color-according-to-mode))) (add-hook 'read-only-mode-hook #'cj/set-cursor-color-according-to-mode) (add-hook 'overwrite-mode-hook #'cj/set-cursor-color-according-to-mode) +;; Add hook to update cursor color when buffer is modified/saved +(add-hook 'after-change-functions + (lambda (&rest _) (cj/set-cursor-color-according-to-mode))) +(add-hook 'after-save-hook #'cj/set-cursor-color-according-to-mode) ;; Don’t show a cursor in non-selected windows: (setq cursor-in-non-selected-windows nil) diff --git a/modules/user-constants.el b/modules/user-constants.el index 2a6d0ca2..eafd08e8 100644 --- a/modules/user-constants.el +++ b/modules/user-constants.el @@ -41,9 +41,10 @@ Example: (setq cj/debug-modules '(org-agenda mail)) ;; ---------------------------- Buffer Status Colors --------------------------- (defconst cj/buffer-status-colors - '((read-only . "#f06a3f") ; red – buffer is read-only - (overwrite . "#c48702") ; gold – overwrite mode - (normal . "#64aa0f")) ; green – insert & read/write + '((read-only . "#f06a3f") ; red – buffer is read-only + (overwrite . "#c48702") ; gold – overwrite mode + (modified . "#64aa0f") ; green – modified & writeable + (unmodified . "#ffffff")) ; white – unmodified & writeable "Alist mapping buffer states to their colors. Used by cursor color, modeline, and other UI elements.") diff --git a/tests/test-ui-buffer-status-colors.el b/tests/test-ui-buffer-status-colors.el new file mode 100644 index 00000000..bb905ad4 --- /dev/null +++ b/tests/test-ui-buffer-status-colors.el @@ -0,0 +1,221 @@ +;;; test-ui-buffer-status-colors.el --- Tests for buffer status colors -*- lexical-binding: t; -*- + +;;; Commentary: +;; Unit tests for buffer status color system. +;; Tests the state detection logic used by both cursor color and modeline. + +;;; Code: + +(require 'ert) +(require 'user-constants) +(require 'ui-config) +(require 'modeline-config) + +;;; Color Constant Tests + +(ert-deftest test-buffer-status-colors-has-all-states () + "Test that all required states are defined in color alist." + (should (alist-get 'read-only cj/buffer-status-colors)) + (should (alist-get 'overwrite cj/buffer-status-colors)) + (should (alist-get 'modified cj/buffer-status-colors)) + (should (alist-get 'unmodified cj/buffer-status-colors))) + +(ert-deftest test-buffer-status-colors-values-are-strings () + "Test that all color values are strings (hex colors)." + (dolist (entry cj/buffer-status-colors) + (should (stringp (cdr entry))) + ;; Check if it looks like a hex color + (should (string-match-p "^#[0-9a-fA-F]\\{6\\}$" (cdr entry))))) + +;;; Cursor Color State Detection Tests + +(ert-deftest test-cursor-color-state-read-only-buffer () + "Test state detection for read-only buffer." + (with-temp-buffer + (setq buffer-read-only t) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'read-only))))) + +(ert-deftest test-cursor-color-state-overwrite-mode () + "Test state detection for overwrite mode." + (with-temp-buffer + (setq buffer-read-only nil) + (overwrite-mode 1) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'overwrite))))) + +(ert-deftest test-cursor-color-state-modified-buffer () + "Test state detection for modified buffer." + (with-temp-buffer + (setq buffer-read-only nil) + (insert "test") + (set-buffer-modified-p t) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'modified))))) + +(ert-deftest test-cursor-color-state-unmodified-buffer () + "Test state detection for unmodified buffer." + (with-temp-buffer + (setq buffer-read-only nil) + (set-buffer-modified-p nil) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'unmodified))))) + +(ert-deftest test-cursor-color-state-priority-read-only-over-modified () + "Test that read-only state takes priority over modified state." + (with-temp-buffer + (insert "test") + (set-buffer-modified-p t) + (setq buffer-read-only t) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'read-only))))) + +(ert-deftest test-cursor-color-state-priority-overwrite-over-modified () + "Test that overwrite mode takes priority over modified state." + (with-temp-buffer + (insert "test") + (set-buffer-modified-p t) + (overwrite-mode 1) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'overwrite))))) + +;;; Integration Tests - Cursor Color Function + +(ert-deftest test-cursor-color-function-exists () + "Test that cursor color function is defined." + (should (fboundp 'cj/set-cursor-color-according-to-mode))) + +(ert-deftest test-cursor-color-returns-correct-color-for-read-only () + "Test cursor color function returns red for read-only buffer." + (with-temp-buffer + (setq buffer-read-only t) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified))) + (color (alist-get state cj/buffer-status-colors))) + (should (equal color "#f06a3f"))))) + +(ert-deftest test-cursor-color-returns-correct-color-for-overwrite () + "Test cursor color function returns gold for overwrite mode." + (with-temp-buffer + (overwrite-mode 1) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified))) + (color (alist-get state cj/buffer-status-colors))) + (should (equal color "#c48702"))))) + +(ert-deftest test-cursor-color-returns-correct-color-for-modified () + "Test cursor color function returns green for modified buffer." + (with-temp-buffer + (insert "test") + (set-buffer-modified-p t) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified))) + (color (alist-get state cj/buffer-status-colors))) + (should (equal color "#64aa0f"))))) + +(ert-deftest test-cursor-color-returns-correct-color-for-unmodified () + "Test cursor color function returns white for unmodified buffer." + (with-temp-buffer + (set-buffer-modified-p nil) + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified))) + (color (alist-get state cj/buffer-status-colors))) + (should (equal color "#ffffff"))))) + +;;; Modeline Integration Tests + +(ert-deftest test-modeline-buffer-name-variable-exists () + "Test that modeline buffer name variable is defined." + (should (boundp 'cj/modeline-buffer-name))) + +(ert-deftest test-modeline-buffer-name-is-mode-line-construct () + "Test that modeline buffer name is a valid mode-line construct." + (should (listp cj/modeline-buffer-name)) + (should (eq (car cj/modeline-buffer-name) :eval))) + +;;; Edge Cases + +(ert-deftest test-buffer-status-new-buffer-starts-unmodified () + "Test that new buffer starts in unmodified state." + (with-temp-buffer + (let* ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'unmodified))))) + +(ert-deftest test-buffer-status-insert-makes-modified () + "Test that inserting text changes state to modified." + (with-temp-buffer + ;; Initially unmodified + (set-buffer-modified-p nil) + (let ((state1 (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state1 'unmodified))) + + ;; Insert text + (insert "test") + (let ((state2 (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state2 'modified))))) + +(ert-deftest test-buffer-status-explicit-unmodify () + "Test that explicitly setting unmodified works." + (with-temp-buffer + (insert "test") + (should (buffer-modified-p)) + + ;; Explicitly set unmodified + (set-buffer-modified-p nil) + (let ((state (cond + (buffer-read-only 'read-only) + (overwrite-mode 'overwrite) + ((buffer-modified-p) 'modified) + (t 'unmodified)))) + (should (eq state 'unmodified))))) + +(provide 'test-ui-buffer-status-colors) +;;; test-ui-buffer-status-colors.el ends here |