hiro/py-vterm-interaction.el
1
0
Fork 0
mirror of https://github.com/vale981/py-vterm-interaction.el synced 2025-03-05 10:01:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix session handling

Browse source
This commit is contained in:
Valentin Boettcher 2024-09-12 11:21:02 -04:00
parent 5a97d7771d
commit ef4ae7103f
No known key found for this signature in database
GPG key ID: E034E12B7AF56ACE
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
python-vterm.el
View file

@ -161,7 +161,9 @@ python interpreter is ipython. This times out after
new-buffer)) new-buffer))
python-vterm-repl--launch-timers) python-vterm-repl--launch-timers)
(add-function :filter-args (process-filter vterm--process) (add-function :filter-args (process-filter vterm--process)
(python-vterm-repl-run-filter-functions-func ses-name))) (python-vterm-repl-run-filter-functions-func ses-name))
(setq python-vterm-session ses-name)
(message python-vterm-session))
new-buffer)) new-buffer))
(defun python-vterm-repl-buffer (&optional session-name restart) (defun python-vterm-repl-buffer (&optional session-name restart)
@ -169,7 +171,7 @@ python interpreter is ipython. This times out after
If there exists no such buffer, one is created and returned. If there exists no such buffer, one is created and returned.
With non-nil RESTART, the existing buffer will be killed and With non-nil RESTART, the existing buffer will be killed and
recreated." recreated."
(let ((ses-name (or session-name "main")) (let ((ses-name (or session-name python-vterm-session "main"))
(env (cons "TERM=xterm-256color" process-environment))) (env (cons "TERM=xterm-256color" process-environment)))
(if-let ((buffer (get-buffer (python-vterm-repl-buffer-name ses-name))) (if-let ((buffer (get-buffer (python-vterm-repl-buffer-name ses-name)))
(alive (vterm-check-proc buffer)) (alive (vterm-check-proc buffer))
@ -405,26 +407,32 @@ inferior Python process and the current active environment."
(defvar-local python-vterm-context nil) (defvar-local python-vterm-context nil)
(defun python-vterm-fellow-repl-buffer (&optional session-name) (defun python-vterm-fellow-repl-buffer (&optional session-name)
"Return the paired REPL buffer or the one specified with SESSION-NAME." "Return the paired REPL buffer or the one specified with SESSION-NAME.
(if session-name If SESSION-NAME is not specified, try to return the currently
associated repl buffer or create a new one with the currently
associated session-name."
(let ((session (or session-name python-vterm-session)))
(if session
(python-vterm-repl-buffer session-name) (python-vterm-repl-buffer session-name)
(if (buffer-live-p python-vterm-fellow-repl-buffer) (if (buffer-live-p python-vterm-fellow-repl-buffer)
python-vterm-fellow-repl-buffer python-vterm-fellow-repl-buffer
(if python-vterm-session (if python-vterm-session
(python-vterm-repl-buffer python-vterm-session) (python-vterm-repl-buffer python-vterm-session)
(python-vterm-repl-buffer))))) (python-vterm-repl-buffer))))))
(defun python-vterm-switch-to-repl-buffer (&optional arg) (defun python-vterm-switch-to-repl-buffer (&optional arg)
"Switch to the paired REPL buffer or to the one with a specified session name. "Switch to the paired REPL buffer or to the one with a specified session name.
With prefix ARG, prompt for session name." With prefix ARG, prompt for session name. If a session name is
provided all future commands will use that session."
(interactive "P") (interactive "P")
(let* ((session-name (let* ((session-name
(cond ((null arg) nil) (cond ((null arg) (or python-vterm-session nil))
(t (completing-read "Session name: " (python-vterm-repl-list-sessions) nil nil nil nil (t (completing-read "Session name: " (python-vterm-repl-list-sessions) nil nil nil nil
(python-vterm-repl-session-name (python-vterm-fellow-repl-buffer)))))) (python-vterm-repl-session-name (python-vterm-fellow-repl-buffer))))))
(script-buffer (current-buffer)) (script-buffer (current-buffer))
(repl-buffer (python-vterm-fellow-repl-buffer session-name))) (repl-buffer (python-vterm-fellow-repl-buffer session-name)))
(setq python-vterm-fellow-repl-buffer repl-buffer) (setq python-vterm-fellow-repl-buffer repl-buffer)
(setq python-vterm-session session-name)
(with-current-buffer repl-buffer (with-current-buffer repl-buffer
(setq python-vterm-repl-script-buffer script-buffer) (setq python-vterm-repl-script-buffer script-buffer)
(switch-to-buffer-other-window repl-buffer)))) (switch-to-buffer-other-window repl-buffer))))
@ -459,21 +467,19 @@ script buffer."
(newline)))))) (newline))))))
(forward-line)) (forward-line))
(defun python-vterm-paste-string (string &optional session-name) (defun python-vterm-paste-string (string)
"Send STRING to the Python REPL buffer using brackted paste mode. "Send STRING to the Python REPL buffer using brackted paste mode."
If SESSION-NAME is given, the REPL with the session name, otherwise (with-current-buffer (python-vterm-fellow-repl-buffer)
the main REPL, is used."
(with-current-buffer (python-vterm-fellow-repl-buffer session-name)
(goto-char (point-max)) (goto-char (point-max))
(when python-vterm-paste-with-clear (when python-vterm-paste-with-clear
(python-vterm-clear-line session-name)) (python-vterm-clear-line))
(vterm-send-string string t) (vterm-send-string string t)
(if python-vterm-paste-with-return (if python-vterm-paste-with-return
(python-vterm-send-return-key)))) (python-vterm-send-return-key))))
(defun python-vterm-clear-line (&optional session-name) (defun python-vterm-clear-line ()
"Clear the current line in the Python REPL buffer." "Clear the current line in the Python REPL buffer."
(with-current-buffer (python-vterm-fellow-repl-buffer session-name) (with-current-buffer (python-vterm-fellow-repl-buffer)
(goto-char (point-max)) (goto-char (point-max))
(vterm-send-key (kbd "C-a")) (vterm-send-key (kbd "C-a"))
(vterm-send-key (kbd "C-k")))) (vterm-send-key (kbd "C-k"))))