Preserve outline visibility

* jupyter-org-extensions.el (jupyter-org-closest-jupyter-language)
(jupyter-org-between-block-end-and-result-p):
(jupyter-org-next-busy-src-block):
(jupyter-org-move-src-block): Do it.
This commit is contained in:
Nathaniel Nicandro 2019-07-22 16:26:50 -05:00
parent 7918293c41
commit 1e6e83c12e

View file

@ -64,6 +64,7 @@ blocks could be found in the buffer.
Distance is line based, not character based. Also, `point' is Distance is line based, not character based. Also, `point' is
assumed to not be inside a source block." assumed to not be inside a source block."
(org-save-outline-visibility nil
(save-excursion (save-excursion
(or (and (null query) (or (and (null query)
(cl-loop (cl-loop
@ -106,7 +107,7 @@ assumed to not be inside a source block."
(let* ((kernelspec (jupyter-completing-read-kernelspec)) (let* ((kernelspec (jupyter-completing-read-kernelspec))
(lang (plist-get (cddr kernelspec) :language))) (lang (plist-get (cddr kernelspec) :language)))
(if (org-babel-jupyter-language-p lang) lang (if (org-babel-jupyter-language-p lang) lang
(format "jupyter-%s" lang)))))) (format "jupyter-%s" lang)))))))
(defun jupyter-org-between-block-end-and-result-p () (defun jupyter-org-between-block-end-and-result-p ()
"If `point' is between a src-block and its result, return the result end. "If `point' is between a src-block and its result, return the result end.
@ -118,7 +119,8 @@ separates the two."
;; after a src block, e.g. for named results that appear somewhere else. ;; after a src block, e.g. for named results that appear somewhere else.
(save-excursion (save-excursion
(let ((start (point))) (let ((start (point)))
(when-let* ((src (and (ignore-errors (org-babel-previous-src-block)) (when-let* ((src (and (org-save-outline-visibility nil
(ignore-errors (org-babel-previous-src-block)))
(org-element-context))) (org-element-context)))
(end (org-element-property :end src)) (end (org-element-property :end src))
(result-pos (org-babel-where-is-src-block-result))) (result-pos (org-babel-where-is-src-block-result)))
@ -330,6 +332,7 @@ With a prefix argument ARG, jump forward ARG many blocks.
When BACKWARD is non-nil, jump to the previous block." When BACKWARD is non-nil, jump to the previous block."
(interactive "p") (interactive "p")
(org-save-outline-visibility nil
(cl-loop (cl-loop
with count = (abs (or arg 1)) with count = (abs (or arg 1))
with origin = (point) with origin = (point)
@ -340,6 +343,7 @@ When BACKWARD is non-nil, jump to the previous block."
(zerop (cl-decf count))) (zerop (cl-decf count)))
finally (goto-char origin) finally (goto-char origin)
(user-error "No %s busy code blocks" (if backward "previous" "further")))) (user-error "No %s busy code blocks" (if backward "previous" "further"))))
(save-match-data (org-show-context)))
;;;###autoload ;;;###autoload
(defun jupyter-org-previous-busy-src-block (arg) (defun jupyter-org-previous-busy-src-block (arg)
@ -598,10 +602,11 @@ If BELOW is non-nil, move the block down, otherwise move it up."
(defun jupyter-org-clear-all-results () (defun jupyter-org-clear-all-results ()
"Clear all results in the buffer." "Clear all results in the buffer."
(interactive) (interactive)
(org-save-outline-visibility nil
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
(while (org-babel-next-src-block) (while (org-babel-next-src-block)
(org-babel-remove-result)))) (org-babel-remove-result)))))
;;;###autoload ;;;###autoload
(defun jupyter-org-interrupt-kernel () (defun jupyter-org-interrupt-kernel ()