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

Fix variable name issues

Browse source
This commit is contained in:
Nathaniel Nicandro 2018-05-15 16:21:08 -05:00
parent ea2736d26f
commit b293747839
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
jupyter-repl-client.el
View file

@ -1389,13 +1389,17 @@ This function constructs candidates assuming that `company-mode'
is used for completion." is used for completion."
(let ((types (plist-get metadata :_jupyter_types_experimental)) (let ((types (plist-get metadata :_jupyter_types_experimental))
(tail matches) (tail matches)
(prefix (substring prefix 0 (- (length prefix) (- end start)))) ;; TODO: Handle the case when the matches are method signatures in the
;; Julia kernel. This information would be useful for doing some kind
;; of eldoc like feature.
(prefix (ignore-errors (substring prefix 0 (- (length prefix) (- end start)))))
(match nil)) (match nil))
;; Set the prefix on the match if needed ;; Set the prefix on the match if needed
(while (setq match (car tail)) (when prefix
(unless (string-prefix-p prefix match) (while (setq match (car tail))
(setcar matches (concat prefix (car matches)))) (unless (string-prefix-p prefix match)
(setq tail (cdr tail))) (setcar tail (concat prefix (car tail))))
(setq tail (cdr tail))))
;; When a type is supplied add it as an annotation ;; When a type is supplied add it as an annotation
(when types (when types
(let ((max-len (apply #'max (mapcar #'length matches)))) (let ((max-len (apply #'max (mapcar #'length matches))))
@ -1802,7 +1806,7 @@ in the appropriate direction, to the saved element."
(setq-local jupyter-repl-lang-buffer (setq-local jupyter-repl-lang-buffer
(get-buffer-create (get-buffer-create
(format " *jupyter-repl-lang-%s*" (format " *jupyter-repl-lang-%s*"
(plist-get language-info :language)))) (plist-get language-info :name))))
(set-syntax-table syntax) (set-syntax-table syntax)
(with-jupyter-repl-lang-buffer (with-jupyter-repl-lang-buffer
(unless (eq major-mode mode) (unless (eq major-mode mode)
@ -2079,7 +2083,7 @@ called interactively, display the new REPL buffer as well."
(jupyter-start-channels client) (jupyter-start-channels client)
(let* ((jupyter-inhibit-handlers t) (let* ((jupyter-inhibit-handlers t)
(info (jupyter-wait-until-received :kernel-info-reply (info (jupyter-wait-until-received :kernel-info-reply
(jupyter-kernel-info-request kc) (jupyter-kernel-info-request client)
5))) 5)))
(unless info (unless info
(destructor client) (destructor client)