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

jupyter-read-expression: Proper use of history variable

Browse source 
Also add the read expression as a history element in the REPL history if the
client is a REPL client.
This commit is contained in:
Nathaniel Nicandro 2019-02-13 16:47:48 -06:00
parent 9aa58ebce2
commit 7f12b0e8e7
No known key found for this signature in database
GPG key ID: C34814B309DD06B8
2 changed files with 30 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
jupyter-client.el
View file

@ -935,6 +935,17 @@ the minibuffer.")
(remove-hook 'completion-at-point-functions 'jupyter-completion-at-point t)
(remove-hook 'minibuffer-exit-hook 'jupyter--teardown-minibuffer t))
;; This is needed since `read-from-minibuffer' expects the history variable to
;; be a symbol whose value is `set' when adding a new history element. Since
;; `jupyter-eval-expression-history' is a buffer (client) local variable, it would be
;; set in the minibuffer which we don't want.
(defvar jupyter--read-expression-history nil
"A client's `jupyter-eval-expression-history' when reading an expression.
This variable is used as the history symbol when reading an
expression from the minibuffer. After an expression is read, the
`jupyter-eval-expression-history' of the client is updated to the
value of this variable.")
(cl-defgeneric jupyter-read-expression ()
"Read an expression using the `jupyter-current-client' for completion.
The expression is read from the minibuffer and the expression
@ -945,22 +956,22 @@ Methods that extend this generic function should
`cl-call-next-method' as a last step."
(cl-check-type jupyter-current-client jupyter-kernel-client
"Need a client to read an expression")
(let ((client jupyter-current-client))
(jupyter-with-client-buffer jupyter-current-client
(minibuffer-with-setup-hook
(lambda ()
(setq jupyter-current-client client)
;; TODO: Enable the kernel languages mode using
;; `jupyter-kernel-language-mode', but there are
;; issues with enabling a major mode.
(add-hook 'completion-at-point-functions
'jupyter-completion-at-point nil t)
(add-hook 'minibuffer-exit-hook
'jupyter--teardown-minibuffer nil t))
(read-from-minibuffer
"Jupyter Ex: " nil
read-expression-map
nil 'jupyter-eval-expression-history)))))
(let* ((client jupyter-current-client)
(jupyter--read-expression-history
(jupyter-get client 'jupyter-eval-expression-history)))
(minibuffer-with-setup-hook
(lambda ()
(setq jupyter-current-client client)
(add-hook 'completion-at-point-functions
'jupyter-completion-at-point nil t)
(add-hook 'minibuffer-exit-hook
'jupyter--teardown-minibuffer nil t))
(prog1 (read-from-minibuffer
"Jupyter Ex: " nil
read-expression-map
nil 'jupyter--read-expression-history)
(jupyter-set client 'jupyter-eval-expression-history
jupyter--read-expression-history)))))
(defun jupyter--display-eval-result (msg)
(jupyter-with-message-data msg ((res text/plain))

4
jupyter-repl.el
View file

@ -1202,7 +1202,9 @@ value."
(jupyter-set jupyter-current-client 'jupyter-eval-expression-history
(delq 'jupyter-repl-history
(ring-elements jupyter-repl-history)))
(cl-call-next-method)))
(let ((ex (cl-call-next-method)))
(prog1 ex
(jupyter-repl-history-add-input ex)))))
;;; Kernel management