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

Add rudimentary history navigation

Browse source
This commit is contained in:
Nathaniel Nicandro 2017-12-31 10:16:41 -06:00
parent d9ec556579
commit 1754c8ce3d
1 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
jupyter-terminal-client.el
View file

@ -57,6 +57,9 @@
(defvar-local jupyter-repl-lang-mode nil (defvar-local jupyter-repl-lang-mode nil
"The major mode corresponding to the kernel's language.") "The major mode corresponding to the kernel's language.")
(defvar-local jupyter-repl-history nil
"The history of the current Jupyter REPL.")
;;; Convenience macros ;;; Convenience macros
(defmacro with-jupyter-repl-buffer (client &rest body) (defmacro with-jupyter-repl-buffer (client &rest body)
@ -455,6 +458,9 @@ The first character of the cell code corresponds to position 1."
(unless (eq cell-req req) (unless (eq cell-req req)
(goto-char (point-max))))) (goto-char (point-max)))))
(defun jupyter-repl-history-add-input (code)
(ring-insert jupyter-repl-history code))
(cl-defmethod jupyter-request-execute ((client jupyter-repl-client) (cl-defmethod jupyter-request-execute ((client jupyter-repl-client)
&key code &key code
(silent nil) (silent nil)
@ -557,39 +563,28 @@ The first character of the cell code corresponds to position 1."
(jupyter-repl-newline) (jupyter-repl-newline)
(jupyter-repl-insert (concat prompt value))))) (jupyter-repl-insert (concat prompt value)))))
(defvar-local jupyter-repl-history nil (defun jupyter-repl-history-next (n)
"The history of the current Jupyter REPL.") (interactive "p")
(setq n (or n 1))
(cl-loop repeat n
do (ring-insert
jupyter-repl-history (ring-remove jupyter-repl-history -1)))
(jupyter-repl-replace-cell-code
(ring-ref jupyter-repl-history -1)))
;; (defun jupyter-repl-history-next (n) (defun jupyter-repl-history-previous (n)
;; (interactive "N") (interactive "p")
;; (setq n (or n 1)) (setq n (or n 1))
;; (let ((pos (ring-member jupyter-repl-history (cl-loop repeat n
;; (jupyter-repl-current-cell-code do (ring-insert-at-beginning
;; jupyter-repl-current-client jupyter-repl-history (ring-remove jupyter-repl-history 0)))
;; 'with-prompts)))) (jupyter-repl-replace-cell-code
;; (when pos (ring-ref jupyter-repl-history -1)))
;; (jupyter-repl-replace-current-cell
;; (ring-ref jupyter-repl-history (+ pos n))))))
;; (defun jupyter-repl-history-previous (n)
;; (interactive "N")
;; (setq n (or n 1))
;; ;; TODO: Fix this, have a current history index or something
;; (let ((pos (ring-member jupyter-repl-history
;; (jupyter-repl-current-cell-code
;; jupyter-repl-current-client
;; 'with-prompts))))
;; (when pos
;; (jupyter-repl-replace-current-cell
;; (ring-ref jupyter-repl-history (- pos n))))))
(cl-defmethod jupyter-handle-history ((client jupyter-repl-client) req history) (cl-defmethod jupyter-handle-history ((client jupyter-repl-client) req history)
(with-jupyter-repl-buffer client (with-jupyter-repl-buffer client
(delete-region (oref client input-start-marker) (point-max)) (cl-loop for (session line-number input-output) in history
(let ((lines (split-string (nth 2 (car (last history))) "\n"))) do (ring-insert jupyter-repl-history input-output))))
(jupyter-repl-insert (car lines))
(dolist (s (cdr lines))
(jupyter-repl-insert s)))))
(cl-defmethod jupyter-handle-is-complete ((client jupyter-repl-client) req status indent) (cl-defmethod jupyter-handle-is-complete ((client jupyter-repl-client) req status indent)
(with-jupyter-repl-buffer client (with-jupyter-repl-buffer client