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

Preserve whitespace when wrapping result in a drawer

Browse source
This commit is contained in:
Nathaniel Nicandro 2019-03-03 17:54:31 -06:00
parent e785b97963
commit 8321f9c301
No known key found for this signature in database
GPG key ID: C34814B309DD06B8
2 changed files with 34 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
jupyter-org-client.el
View file

@ -957,18 +957,21 @@ new \"scalar\" result with the result of calling
(goto-char (jupyter-org-element-end-before-blanks element))
(line-beginning-position 0))))
(defun jupyter-org-delete-element (element)
(defun jupyter-org--delete-element (element)
"Delete an `org' ELEMENT from the buffer.
Leave its affiliated keywords and preserve any blank lines that
appear after the element."
(delete-region (jupyter-org-element-begin-after-affiliated element)
(jupyter-org-element-end-before-blanks element)))
(jupyter-org-element-end-before-blanks element))
;; Delete a blank line after the element
(when (eq (char-after) ?\n)
(delete-char 1)))
(defun jupyter-org-strip-last-newline (string)
"Return STRING with its last newline removed."
(replace-regexp-in-string "\n\\'" "" string))
(defun jupyter-org-insert-element (element)
(defun jupyter-org--insert-element (element)
"Insert ELEMENT."
;; `org-element-interpret-data' will add the newline back.
(when (eq (char-after) ?\n)
@ -1077,8 +1080,8 @@ is a stream result. Otherwise return nil."
"Replace the fixed-width ELEMENT with an example-block.
Append RESULT to the contents of the block. If KEEP-NEWLINE is
non-nil, ensure that the appended RESULT begins on a newline."
(jupyter-org-delete-element element)
(jupyter-org-insert-element
(jupyter-org--delete-element element)
(jupyter-org--insert-element
(jupyter-org-example-block
(concat
;; TODO: optimize this
@ -1094,7 +1097,7 @@ non-nil, ensure that the appended RESULT begins on a newline."
(insert result)
(if keep-newline (insert "\n")
(insert (substring result 0 (match-end 0))))
(jupyter-org-insert-element
(jupyter-org--insert-element
(jupyter-org-scalar
(jupyter-org-strip-last-newline
(if keep-newline result

25
test/jupyter-test.el
View file

@ -1633,6 +1633,31 @@ print(\"z\")"
"
:async "yes"))))
(ert-deftest jupyter-org-wrapping-with-drawer ()
:tags '(org)
(ert-info ("Preserve whitespace after wrapping a result")
(jupyter-org-test-src-block
"\
print(\"foo\", flush=True)
1 + 1"
"\
:RESULTS:
: foo
: 2
:END:
"
:async "yes")
(jupyter-org-test-src-block
"\
print(\"foo\", flush=True)
1 + 1"
"\
:RESULTS:
: foo
: 2
:END:
")))
(ert-deftest org-babel-jupyter-:results-header-arg ()
:tags '(org)
(ert-info ("scalar suppresses table output")