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

make the run defun more robust

Browse source
This commit is contained in:
Valentin Boettcher 2025-01-21 12:26:19 -05:00
parent 9c85cdaf4b
commit f91baed57a
No known key found for this signature in database
GPG key ID: E034E12B7AF56ACE
1 changed files with 42 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
py-vterm-interaction.el
View file

@ -560,36 +560,50 @@ point, the cell is assumed to end with the buffer."
"Send the current function the Python REPL and paste its name, ready to run.
If the function has no arguments, the function call is run immediately."
(interactive)
(let* ((function-name-regex "def[ \t]+\\([a-zA-Z_][a-zA-Z0-9_]*\\)[ \t]*(\\(.*\\)):"))
(save-mark-and-excursion
(python-mark-defun)
(let ((name-found (save-mark-and-excursion (re-search-forward function-name-regex (mark) t))))
(if name-found
(let ((name (match-string 1))
(args (match-string 2))
(py-vterm-interaction-paste-with-return nil)
(begin (region-beginning))
(end (region-end)))
(save-mark-and-excursion
;; (let ((last-mark (mark)))
;; (python-mark-defun)
;; (while (not (eq (mark) last-mark))
;; (setf last-mark (mark))
;; (python-mark-defun 1)))
;; (mark (region-beginning))
;; (next-line)
;; (cl-return)
(let ((begin (save-mark-and-excursion
(python-nav-beginning-of-defun 1)
(point)))
(end (save-mark-and-excursion
(python-nav-end-of-defun)
(point))))
(python-nav-beginning-of-defun 1)
(next-line)
(let ((function-name-regex "def[ \t]+\\([a-zA-Z_][a-zA-Z0-9_]*\\)[ \t]*(\\(.*\\))\\([ \t]*->[ \t]*.*?\\)?:"))
(save-match-data
(let ((name-found (re-search-backward function-name-regex nil nil)))
(if name-found
(progn
(let ((name (match-string 1))
(args (match-string 2))
(py-vterm-interaction-paste-with-return nil))
;; capture decorators too
(save-excursion
(while
(progn (forward-line -1)
(beginning-of-line)
(if (looking-at "@")
(setq begin (point))
nil))))
;; capture decorators too
(save-excursion
(while
(progn (forward-line -1)
(beginning-of-line)
(if (looking-at "@")
(setq begin (point))
nil))))
(let ((func (buffer-substring-no-properties begin end)))
(py-vterm-interaction--send-maybe-silent func name)
(py-vterm-interaction-send-return-key))
(if (string-empty-p args)
(progn
(py-vterm-interaction-paste-string (format "%s()" name))
(py-vterm-interaction-send-return-key))
(py-vterm-interaction-paste-string (format "%s(" name))))
(message "No function found"))))))
(let ((func (buffer-substring-no-properties begin end)))
(py-vterm-interaction--send-maybe-silent func name)
(py-vterm-interaction-send-return-key))
(if (= 0 (length args))
(progn
(py-vterm-interaction-paste-string (format "%s() " name))
(py-vterm-interaction-send-return-key))
(py-vterm-interaction-paste-string (format "%s(" name)))))
(message "No function found"))))))))
(defun py-vterm-interaction-send-buffer ()
"Send the whole content of the script buffer to the Python REPL line by line."