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

jupyter-repl-completing-read-repl-buffer: Modify return value

Browse source 
Return nil in the case that there are no REPL buffers available,
previously an error was raised.  Allows for a simplification at one
call site.
This commit is contained in:
Nathaniel Nicandro 2021-04-02 11:45:14 -05:00
parent 5ca326ffd4
commit f859568eaf
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
jupyter-repl.el
View file

@ -299,11 +299,13 @@ Do this only when the `major-mode' is `jupyter-repl-mode'."
(defun jupyter-repl-completing-read-repl-buffer (&optional mode) (defun jupyter-repl-completing-read-repl-buffer (&optional mode)
"Return a REPL buffer, selecting from all available ones. "Return a REPL buffer, selecting from all available ones.
Return nil if no REPL buffers are available.
MODE has the same meaning as in MODE has the same meaning as in
`jupyter-repl-available-repl-buffers'." `jupyter-repl-available-repl-buffers'."
(let* ((buffers (or (jupyter-repl-available-repl-buffers mode) (when-let* ((buffers (jupyter-repl-available-repl-buffers mode))
(error "No REPLs available"))) (names (mapcar #'buffer-name buffers))
(buffer (completing-read "REPL buffer: " (mapcar #'buffer-name buffers) nil t))) (buffer (completing-read "REPL buffer: " names nil t)))
(when (equal buffer "") (when (equal buffer "")
(error "No REPL buffer selected")) (error "No REPL buffer selected"))
(get-buffer buffer))) (get-buffer buffer)))
@ -1475,7 +1477,8 @@ the kernel `jupyter-current-client' is connected to."
;; selecting a client based on the REPL buffer. ;; selecting a client based on the REPL buffer.
(buffer-local-value (buffer-local-value
'jupyter-current-client 'jupyter-current-client
(jupyter-repl-completing-read-repl-buffer))))) (or (jupyter-repl-completing-read-repl-buffer)
(error "No REPLs available"))))))
(cl-check-type client jupyter-repl-client) (cl-check-type client jupyter-repl-client)
(unless shutdown (unless shutdown
;; This may have been set to t due to a non-responsive kernel so make sure ;; This may have been set to t due to a non-responsive kernel so make sure
@ -1922,11 +1925,8 @@ of a subclass. If CLIENT is a buffer or the name of a buffer, use
the `jupyter-current-client' local to the buffer." the `jupyter-current-client' local to the buffer."
(interactive (interactive
(list (list
(let ((buffer (when-let* ((buffer (jupyter-repl-completing-read-repl-buffer major-mode)))
(when (jupyter-repl-available-repl-buffers major-mode) (buffer-local-value 'jupyter-current-client buffer))))
(jupyter-repl-completing-read-repl-buffer major-mode))))
(when buffer
(buffer-local-value 'jupyter-current-client buffer)))))
(if (not client) (if (not client)
(when (y-or-n-p "No REPL for `major-mode' exists. Start one? ") (when (y-or-n-p "No REPL for `major-mode' exists. Start one? ")
(call-interactively #'jupyter-run-repl)) (call-interactively #'jupyter-run-repl))