Skip to content

fix(ediff): restore chat side-window after ediff session #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericdallo merged 10 commits into from
Sep 12, 2025
Merged

fix(ediff): restore chat side-window after ediff session #41

Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
86304a1
fix(ediff): restore chat side-window after ediff session
ChetanKoneru Sep 12, 2025
2ea0ffa
enhance ediff function
ChetanKoneru Sep 12, 2025
3dddc5b
fix formatting
ChetanKoneru Sep 12, 2025
6f4abbe
feat(ediff): add Doom Emacs compatibility for window and popup handling
ChetanKoneru Sep 12, 2025
8fecd3f
decouple eco-chat.el , new file eca-diff.el
ChetanKoneru Sep 12, 2025
bec3555
clean up eca-chat.el
ChetanKoneru Sep 12, 2025
4f27339
remove duplicates and clean up
ChetanKoneru Sep 12, 2025
3cc84f5
clean up eco-chat.el
ChetanKoneru Sep 12, 2025
f19a046
package `f` is already present
ChetanKoneru Sep 12, 2025
36dd0b9
remove ediff and smerge requirement from eca-caht
ChetanKoneru Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 134 additions & 45 deletions eca-chat.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,24 +957,44 @@ Adds \\='q\\=' to quit."
(defun eca-chat--show-diff-ediff (path diff)
"Show DIFF for file at PATH using Ediff side-by-side in windows.
Uses window configuration management instead of creating frames.

If the current window is a side window, temporarily clear side-window
protections so Ediff can split windows freely. The original window
configuration is restored when Ediff quits via the cleanup hook."
(let* ((parsed (eca-chat--parse-unified-diff diff))
(orig (plist-get parsed :original))
(new (plist-get parsed :new))
(buf-orig (generate-new-buffer (format "*eca-diff-orig:%s*" path)))
(buf-new (generate-new-buffer (format "*eca-diff-new:%s*" path)))
(cwc (current-window-configuration))
configuration is restored when Ediff quits via the cleanup hook.
Enhanced with Doom Emacs compatibility."
(let* ((parsed (eca-chat--parse-unified-diff diff))
(orig (plist-get parsed :original))
(new (plist-get parsed :new))
(buf-orig (generate-new-buffer (format "*eca-diff-orig:%s*"
path)))
(buf-new (generate-new-buffer (format "*eca-diff-new:%s*"
path)))
(chat-buf (current-buffer))
;; Doom-specific: Check if we're in a popup context
(doom-popup-p (and (boundp '+popup-buffer-mode)
+popup-buffer-mode))
(in-doom-p (featurep 'doom))
;; Don't save window config if in Doom popup - causes conflicts
(cwc (unless doom-popup-p
(current-window-configuration)))
(orig-selected (selected-window))
(orig-buffer (current-buffer))
(ediff-buffers-before
(seq-filter (lambda (b)
(string-match-p "\\*\\(ediff-\\|Ediff Control\\)" (buffer-name b)))
(string-match-p "\\*\\(ediff-\\|Ediff Control\\)"
(buffer-name b)))
(buffer-list)))
(session-ediff-buffers nil)
(cleanup-fn nil)
(after-setup-fn nil))
cleanup-fn
after-setup-fn)

;; Doom-specific: Set popup rules to prevent interference
(when in-doom-p
(when (fboundp 'set-popup-rule!)
;; Prevent ECA diff buffers from being managed by Doom's popup
system
Comment thread
ChetanKoneru marked this conversation as resolved.
Outdated
(set-popup-rule! "^\\*eca-diff-" :ignore t)
(set-popup-rule! "^\\*Ediff Control Panel" :ignore t)))

;; Fill temporary buffers
(with-current-buffer buf-orig
(let ((inhibit-read-only t))
Expand All @@ -987,50 +1007,104 @@ configuration is restored when Ediff quits via the cleanup hook."
(insert new)
(set-buffer-modified-p nil)))

;; Temporarily relax side-window protections in the current frame so
;; Ediff can split windows. The original configuration will be
;; restored by `cleanup-fn' (which calls `set-window-configuration').
(let ((frame (selected-frame)))
(dolist (w (seq-filter (lambda (w)
(and (eq (window-frame w) frame)
(or (window-parameter w 'no-delete-other-windows)
(window-parameter w 'window-side))))
(window-list)))
(when (window-live-p w)
(set-window-parameter w 'no-delete-other-windows nil)
(set-window-parameter w 'window-side nil))))

;; Ensure Ediff has a single full window to manage (it will split it).
(unless (one-window-p t)
(delete-other-windows))

;; Cleanup: restore windows and kill temp/session buffers
;; Only manipulate windows if not in Doom popup context
(unless doom-popup-p
;; Temporarily relax side-window protections so Ediff can split
(let ((frame (selected-frame)))
(dolist (w (seq-filter (lambda (w)
(and (eq (window-frame w) frame)
(or (window-parameter w

'no-delete-other-windows)
(window-parameter w

'window-side))))
(window-list)))
(when (window-live-p w)
(set-window-parameter w 'no-delete-other-windows nil)
(set-window-parameter w 'window-side nil))))
;; Ensure Ediff has a single full window to manage
(unless (one-window-p t)
(delete-other-windows)))

;; Enhanced cleanup with Doom compatibility
(setq cleanup-fn
(lambda ()
;; Restore window configuration saved at the beginning
(when (window-configuration-p cwc)
(set-window-configuration cwc))
;; Ensure focus returns to the original window if still live
(when (window-live-p orig-selected)
(select-window orig-selected))
;; Kill temp buffers first to avoid conflicts
(when (buffer-live-p buf-orig) (kill-buffer buf-orig))
(when (buffer-live-p buf-new) (kill-buffer buf-new))
(when (buffer-live-p buf-new) (kill-buffer buf-new))
;; Kill any additional Ediff-generated buffers
(dolist (b session-ediff-buffers)
(when (and b (buffer-live-p b))
(kill-buffer b)))

;; Doom-aware window restoration
(cond
;; If we were in a Doom popup, use Doom's restoration
(doom-popup-p
(cond
((and (fboundp '+popup/restore) (buffer-live-p
orig-buffer))
(+popup/restore))
((buffer-live-p orig-buffer)
(switch-to-buffer orig-buffer))))

;; Standard window config restoration with Doom-compatible delay
(cwc
;; Use longer delay for Doom compatibility
(run-with-timer (if in-doom-p 0.3 0.1) nil
(lambda ()
(condition-case err
(progn
(set-window-configuration cwc)
(when (window-live-p orig-selected)
(select-window orig-selected))
;; Re-display chat buffer in side window if needed
(when (and (buffer-live-p chat-buf)
(or (not (get-buffer-window chat-buf
t))
(not (window-parameter
(get-buffer-window chat-buf
t)
'window-side))))
(ignore-errors (eca-chat--display-buffer
chat-buf))))
(error
(message "ECA: Could not restore window config: %s"
err)
;; Fallback: ensure chat buffer is visible
(when (buffer-live-p chat-buf)
(ignore-errors (eca-chat--display-buffer
chat-buf))))))))

;; Fallback for cases without saved config
(t
(when (and (buffer-live-p chat-buf)
(or (not (get-buffer-window chat-buf t))
(not (window-parameter
(get-buffer-window chat-buf t)
'window-side))))
(ignore-errors (eca-chat--display-buffer chat-buf)))))

(remove-hook 'ediff-quit-hook cleanup-fn)))

;; After-setup hook: capture ediff buffers and move to first diff
(setq after-setup-fn
(lambda ()
(let ((ediff-buffers-after
(seq-filter (lambda (b)
(string-match-p "\\*\\(ediff-\\|Ediff Control\\)" (buffer-name b)))
(string-match-p "\\*\\(ediff-\\|Ediff
Control\\)"
(buffer-name b)))
(buffer-list))))
(setq session-ediff-buffers
(seq-filter (lambda (b)
(and (not (member b ediff-buffers-before))
(not (string-match-p "\*Ediff Registry\*" (buffer-name b)))))
(and (not (member b
ediff-buffers-before))
(not (string-match-p "*Ediff
Registry*"
(buffer-name
b)))))
ediff-buffers-after)))
(condition-case _err
(progn
Expand All @@ -1039,21 +1113,36 @@ configuration is restored when Ediff quits via the cleanup hook."
(error nil))
(remove-hook 'ediff-after-setup-windows-hook after-setup-fn)))

;; Install hooks
(add-hook 'ediff-quit-hook cleanup-fn)
(add-hook 'ediff-after-setup-windows-hook after-setup-fn)

;; Start Ediff in the prepared window environment. Ediff will manage
;; splits from here on. On error, restore original windows/config.
;; Start Ediff with error handling
(condition-case err
(ediff-buffers buf-orig buf-new)
(error
;; On error remove hooks and kill temps, and restore windows
;; On error, remove hooks and restore windows
(remove-hook 'ediff-quit-hook cleanup-fn)
(remove-hook 'ediff-after-setup-windows-hook after-setup-fn)
(when (window-configuration-p cwc)
(set-window-configuration cwc))

;; Doom-aware error recovery
(cond
(cwc (set-window-configuration cwc))
(doom-popup-p
(when (buffer-live-p orig-buffer)
(switch-to-buffer orig-buffer))))

;; Re-display chat buffer on error
(when (and (buffer-live-p chat-buf)
(or (not (get-buffer-window chat-buf t))
(not (window-parameter (get-buffer-window chat-buf
t)
'window-side))))
(ignore-errors (eca-chat--display-buffer chat-buf)))

;; Kill temp buffers
(when (buffer-live-p buf-orig) (kill-buffer buf-orig))
(when (buffer-live-p buf-new) (kill-buffer buf-new))
(when (buffer-live-p buf-new) (kill-buffer buf-new))
(message "eca-chat: error starting ediff: %s" err)))))

(defun eca-chat--show-diff-smerge (path diff)
Expand Down
Loading