From 554b32db5da9630fa24fb2abf3f93f21b03ff7a0 Mon Sep 17 00:00:00 2001 From: Craig Jennings Date: Sat, 9 May 2026 11:58:52 -0500 Subject: feat(vterm): F12 toggle that excludes claude and preserves geometry vterm-toggle picked the most-recently-selected vterm buffer as F12's toggle target. After using F9 on a claude vterm, the most-recent vterm IS claude, so F12 ended up toggling claude, which has its own F9 / C-F9 / M-F9 surface in ai-vterm.el and shouldn't be affected. The display rule also had a hard-coded `(window-height . 0.7)` that overrode mouse-resize and orientation flips on every toggle. I replaced the F12 binding with `cj/vterm-toggle` in `eshell-vterm-config.el`, mirroring the pattern shipped in ai-vterm.el: - `cj/--vterm-toggle-buffer-p` excludes claude-prefixed buffers from F12's candidate set. - `cj/--vterm-toggle-capture-state` records direction + body size at toggle-off. - `cj/--vterm-toggle-display-saved` replays via `(body-columns . N)` / `(body-lines . N)` cons forms with the cardinal direction mapped to its frame-edge variant (`right` -> `rightmost`, `below` -> `bottom`, etc.) so vterm always lands at the captured edge regardless of selected window. - `cj/vterm-toggle` uses `delete-window` (with `one-window-p` guard) on toggle-off so buffer-move scenarios don't leak ghost windows. Default direction is `'below` to match F12's traditional bottom split. The vterm-toggle package stays installed so `M-x vterm-toggle` still works. Only the F12 binding changes. 19 new tests across three files: buffer-filter, dispatch, display. Full make test green. Tradeoff: ~150 lines of geometry helpers and capture/display action logic are duplicated from ai-vterm.el. Worth extracting into a shared module now that two consumers exist. I filed it as a follow-up rather than blocking this ship. --- tests/test-vterm-toggle--display.el | 116 ++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 tests/test-vterm-toggle--display.el (limited to 'tests/test-vterm-toggle--display.el') diff --git a/tests/test-vterm-toggle--display.el b/tests/test-vterm-toggle--display.el new file mode 100644 index 00000000..70fa61ac --- /dev/null +++ b/tests/test-vterm-toggle--display.el @@ -0,0 +1,116 @@ +;;; test-vterm-toggle--display.el --- Tests for the F12 display-saved action -*- lexical-binding: t; -*- + +;;; Commentary: +;; Covers the F12-side equivalents of the ai-vterm display tests: +;; geometry capture (window-direction, window-size with 'below +;; default), capture-state writing module-level vars, and the custom +;; display action mapping cardinal -> edge directions. Tests stub +;; `display-buffer-in-direction' to capture the alist that would +;; have reached it. + +;;; Code: + +(require 'ert) +(require 'cl-lib) + +(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 + (delete-other-windows) + (let ((below (split-window (selected-window) nil 'below)) + (cj/--vterm-toggle-last-direction nil) + (cj/--vterm-toggle-last-size nil)) + (cj/--vterm-toggle-capture-state below) + (should (eq cj/--vterm-toggle-last-direction 'below)) + (should (integerp cj/--vterm-toggle-last-size)) + (should (= cj/--vterm-toggle-last-size (window-body-height below)))))) + +(ert-deftest test-vterm-toggle--capture-state-noop-on-dead-window () + "Boundary: nil window -> state remains unchanged." + (let ((cj/--vterm-toggle-last-direction 'sentinel) + (cj/--vterm-toggle-last-size 0.123)) + (cj/--vterm-toggle-capture-state nil) + (should (eq cj/--vterm-toggle-last-direction 'sentinel)) + (should (= cj/--vterm-toggle-last-size 0.123)))) + +(ert-deftest test-vterm-toggle--display-saved-defaults-when-state-nil () + "Normal: nil state -> direction=bottom, size=cj/vterm-toggle-window-height." + (let (received-alist + (cj/--vterm-toggle-last-direction nil) + (cj/--vterm-toggle-last-size nil) + (cj/vterm-toggle-window-height 0.7)) + (cl-letf (((symbol-function 'display-buffer-in-direction) + (lambda (_b a) (setq received-alist a) 'fake-window))) + (cj/--vterm-toggle-display-saved 'fake-buf '((inhibit-same-window . t)))) + (should (eq (cdr (assq 'direction received-alist)) 'bottom)) + (should (= (cdr (assq 'window-height received-alist)) 0.7)) + (should (eq (cdr (assq 'inhibit-same-window received-alist)) t)))) + +(ert-deftest test-vterm-toggle--display-saved-maps-cardinal-to-edge () + "Normal: saved 'below maps to bottom edge; integer size wraps in body-lines." + (let (received-alist + (cj/--vterm-toggle-last-direction 'below) + (cj/--vterm-toggle-last-size 12)) + (cl-letf (((symbol-function 'display-buffer-in-direction) + (lambda (_b a) (setq received-alist a) 'fake-window))) + (cj/--vterm-toggle-display-saved 'fake-buf nil)) + (should (eq (cdr (assq 'direction received-alist)) 'bottom)) + (should (equal (cdr (assq 'window-height received-alist)) + '(body-lines . 12))) + (should-not (assq 'window-width received-alist)))) + +(ert-deftest test-vterm-toggle--display-saved-strips-conflicting-alist-entries () + "Boundary: caller-supplied direction/size are stripped, saved values win." + (let (received-alist + (cj/--vterm-toggle-last-direction 'right) + (cj/--vterm-toggle-last-size 30)) + (cl-letf (((symbol-function 'display-buffer-in-direction) + (lambda (_b a) (setq received-alist a) 'fake-window))) + (cj/--vterm-toggle-display-saved + 'fake-buf + '((direction . above) + (window-width . 0.2) + (window-height . 0.3) + (inhibit-same-window . t)))) + (should (eq (cdr (assq 'direction received-alist)) 'rightmost)) + (should (equal (cdr (assq 'window-width received-alist)) + '(body-columns . 30))) + (let ((wh-cells (cl-remove-if-not + (lambda (cell) (eq (car-safe cell) 'window-height)) + received-alist))) + (should (null wh-cells))))) + +(provide 'test-vterm-toggle--display) +;;; test-vterm-toggle--display.el ends here -- cgit v1.2.3