hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-05 07:41:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Take into account changes to REPL initialization in jupyter-repl-ret

Browse source 
Specifically the REPL is always initialized with a new prompt due to
`jupyter-repl-update-execution-counter` being called as the final step in REPL
initialization. This means that there is no need to catch a
`beginning-of-buffer` error in `jupyter-repl-ret`.

Also remove the need for the `code` variable, just use `jupyter-repl-cell-code`
directly in the `jupyter-is-complete-request`.
This commit is contained in:
Nathaniel Nicandro 2018-01-04 17:34:08 -06:00
parent 184ba4cca6
commit 6fabeeeadf
1 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
jupyter-terminal-client.el
View file

@ -634,26 +634,21 @@ The first character of the cell code corresponds to position 1."
(setq current-cell-pos
(save-excursion
(goto-char (point-max))
(condition-case nil
(jupyter-repl-cell-beginning-position)
(beginning-of-buffer nil))))
(if current-cell-pos
(if (< (point) current-cell-pos)
(goto-char (point-max))
;; TODO: Not all kernels will respond to an is_complete_request. The
;; jupyter console will switch to its own internal handler when the
;; request times out.
(let* ((code (jupyter-repl-cell-code))
(res (jupyter-wait-until-received 'is-complete-reply
(jupyter-is-complete-request
jupyter-repl-current-client
:code code))))
;; If the kernel responds to an is-complete request then the
;; is-complete handler takes care of executing the code.
(unless res
;; TODO: Indent or send (on prefix arg)?
)))
(jupyter-repl-insert-prompt 'in))))
(jupyter-repl-cell-beginning-position)))
(if (< (point) current-cell-pos)
(goto-char (point-max))
;; TODO: Not all kernels will respond to an is_complete_request. The
;; jupyter console will switch to its own internal handler when the
;; request times out.
(let ((res (jupyter-wait-until-received 'is-complete-reply
(jupyter-is-complete-request
jupyter-repl-current-client
:code (jupyter-repl-cell-code)))))
;; If the kernel responds to an is-complete request then the
;; is-complete handler takes care of executing the code.
(unless res
;; TODO: Indent or send (on prefix arg)?
)))))
(defun jupyter-repl-indent-line ()
"Indent the line according to the language of the REPL."