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

Do not rely on any markers to find positions in the buffer

Browse source
This commit is contained in:
Nathaniel Nicandro 2017-12-27 21:47:00 -06:00
parent 58c810e187
commit c43eea4938
1 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
jupyter-terminal-client.el
View file

@ -515,27 +515,34 @@ Returns the count of cells left to move."
(defun jupyter-repl-ret (arg)
(interactive "P")
(let* ((client jupyter-repl-current-client)
(mark (oref client input-start-marker)))
(if (not (marker-position mark))
(jupyter-wait-until-idle
client (jupyter-request-execute client :code ""))
(if (< (point) mark)
(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 (with-jupyter-repl-buffer client
(jupyter-repl-cell-code)))
(res (jupyter-wait-until-received
client 'is-complete-reply
(jupyter-request-is-complete 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)?
)
)))))
(let (current-cell-pos)
(setq current-cell-pos
(save-excursion
(goto-char (point-max))
(condition-case nil
(jupyter-repl-cell-beginning-position)
;; No way to find end of previous cell if we go to `point-max'
(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
jupyter-repl-current-client
'is-complete-reply
(jupyter-request-is-complete
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)?
)))
(let ((inhibit-read-only t))
(jupyter-repl-insert-prompt 'in)))))
;; TODO: Before change function to delete prompt when attempting to delete
;; past the code/prompt boundary.