From 7ad613f96380319c037f367a1b6b1beda03846ca Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Sat, 9 May 2026 14:48:01 -0500 Subject: refactor: extract window-geometry helpers shared by F9 and F12 `ai-vterm.el` (F9) and `eshell-vterm-config.el` (F12) both grew the same geometry-preservation pattern: classify a window's position, capture its body size, map cardinal direction to its frame-edge variant. The shared helpers were sitting as near-duplicates in both modules. With two real consumers established, the abstraction has the right shape. I pulled them into `cj-window-geometry.el`. The new module exposes three pure helpers: - `cj/window-direction` returns right/below/left/above based on edges relative to `frame-root-window`. Takes an optional DEFAULT for the single-window-frame fallback so each consumer picks its own (ai-vterm wants 'right, vterm-toggle wants 'below). - `cj/window-body-size` returns body-cols (right/left) or body-lines (below/above). Same body-vs-total reasoning as before: divider-independent, matches what the user sees. - `cj/cardinal-to-edge-direction` maps right/left/below/above to rightmost/leftmost/bottom/top, used by each consumer's `display-saved` action. `ai-vterm.el` and `eshell-vterm-config.el` now `(require 'cj-window-geometry)` and call the shared helpers directly. The consumer-specific `capture-state` and `display-saved` bodies stay in each module because they bind to consumer-specific state vars. Extracting those would either need parameter-passing-via-symbol or a macro, both heavier than the duplication they would remove. Tests: 15 in `test-cj-window-geometry.el` covering all four directions, body-size on both axes, cardinal-to-edge mapping, default-arg fallback, and the unknown-direction nil case. Deleted `test-ai-vterm--window-geometry.el` (now redundant) and trimmed four duplicate window-direction/size tests from `test-vterm-toggle--display.el`. Net LOC: each consumer ~40-50 lines lighter, with the new module + tests paying roughly half that back. Full make test green. make validate-modules green. --- tests/test-vterm-toggle--display.el | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'tests/test-vterm-toggle--display.el') diff --git a/tests/test-vterm-toggle--display.el b/tests/test-vterm-toggle--display.el index 70fa61ac..ed7cd858 100644 --- a/tests/test-vterm-toggle--display.el +++ b/tests/test-vterm-toggle--display.el @@ -16,35 +16,6 @@ (add-to-list 'load-path (expand-file-name "modules" user-emacs-directory)) (require 'eshell-vterm-config) -(ert-deftest test-vterm-toggle--window-direction-single-window-defaults-to-below () - "Boundary: full-frame window -> default 'below for F12." - (save-window-excursion - (delete-other-windows) - (should (eq (cj/--vterm-toggle-window-direction (selected-window)) - 'below)))) - -(ert-deftest test-vterm-toggle--window-direction-below-split () - "Normal: bottom window of horizontal split -> 'below." - (save-window-excursion - (delete-other-windows) - (let ((below (split-window (selected-window) nil 'below))) - (should (eq (cj/--vterm-toggle-window-direction below) 'below))))) - -(ert-deftest test-vterm-toggle--window-direction-right-split () - "Normal: right window of vertical split -> 'right." - (save-window-excursion - (delete-other-windows) - (let ((right (split-window (selected-window) nil 'right))) - (should (eq (cj/--vterm-toggle-window-direction right) 'right))))) - -(ert-deftest test-vterm-toggle--window-size-returns-body () - "Normal: returns body-width for right/left, body-height for below/above." - (save-window-excursion - (delete-other-windows) - (let ((below (split-window (selected-window) nil 'below))) - (should (= (cj/--vterm-toggle-window-size below 'below) - (window-body-height below)))))) - (ert-deftest test-vterm-toggle--capture-state-records-direction-and-size () "Normal: capture-state writes direction and integer body size." (save-window-excursion -- cgit v1.2.3