emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix reuse of same repl buffer across projects

Browse source
This commit is contained in:
Henrik Lissner 2018-07-01 01:10:51 +02:00
parent cddde09b79
commit dd71f54e5e
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

46
modules/feature/eval/autoload/repl.el
View file

@ -1,32 +1,36 @@
;;; feature/eval/autoload/repl.el -*- lexical-binding: t; -*- ;;; feature/eval/autoload/repl.el -*- lexical-binding: t; -*-
(defvar +eval-repl-buffer nil (defvar +eval-repl-buffers-alist ()
"The buffer of the last open repl.") "The buffer of the last open repl.")
(define-minor-mode +eval-repl-mode (define-minor-mode +eval-repl-mode
"A minor mode for REPL buffers.") "A minor mode for REPL buffers.")
(defun +eval--ensure-in-repl-buffer (&optional command same-window-p) (defun +eval--ensure-in-repl-buffer (&optional command same-window-p)
(cond ((eq (current-buffer) +eval-repl-buffer)) (setq +eval-repl-buffers-alist
((and +eval-repl-buffer (cl-remove-if-not #'buffer-live-p +eval-repl-buffers-alist
(buffer-live-p +eval-repl-buffer)) :key #'cdr))
(when-let* ((win (get-buffer-window +eval-repl-buffer))) (let* ((project-root (doom-project-root 'nocache))
(select-window win))) (key (cons major-mode project-root))
(command (buffer (cdr (assoc key +eval-repl-buffers-alist))))
(let ((repl-buffer (save-window-excursion (call-interactively command)))) (unless (and (bufferp buffer)
(unless (bufferp repl-buffer) (eq buffer (current-buffer)))
(error "REPL command didn't return a buffer")) (funcall (if same-window-p #'switch-to-buffer #'pop-to-buffer)
(with-current-buffer repl-buffer (+eval-repl-mode +1)) (if (buffer-live-p buffer)
(setq +eval-repl-buffer repl-buffer)))) buffer
(unless (eq (current-buffer) +eval-repl-buffer) (setq buffer (save-window-excursion (call-interactively command)))
(funcall (if same-window-p #'switch-to-buffer #'pop-to-buffer) (unless (bufferp buffer)
+eval-repl-buffer)) (error "REPL command didn't return a buffer"))
(with-current-buffer +eval-repl-buffer (with-current-buffer buffer (+eval-repl-mode +1))
(goto-char (if (and (derived-mode-p 'comint-mode) (setf (alist-get key +eval-repl-buffers-alist nil nil #'equal)
(cdr comint-last-prompt)) buffer)
(cdr comint-last-prompt) buffer)))
(point-max))) (with-current-buffer buffer
t)) (goto-char (if (and (derived-mode-p 'comint-mode)
(cdr comint-last-prompt))
(cdr comint-last-prompt)
(point-max)))
buffer)))
;;;###autoload ;;;###autoload
(defun +eval/open-repl (&optional same-window-p) (defun +eval/open-repl (&optional same-window-p)