jupyter-org--append-stream-result: Consider org-edit-src-content-indentation

jupyter-org-client.el

@@ -1079,8 +1079,17 @@ insertion into the buffer."
       ;; Delete the newline that will be re-inserted by the call to
       ;; `org-element-normalize-string'.
       (delete-char 1)
-      (insert (concat (when keep-newline "\n")
+      (setq result (org-element-normalize-string result))
-                      (org-element-normalize-string result))))))
+      ;; From `org-element-example-block-interpreter'
+      (when (and (not org-src-preserve-indentation)
+                 (/= 0 org-edit-src-content-indentation)
+                 (version<= "9.2" (org-version)))
+        (let ((ind (make-string org-edit-src-content-indentation ?\s)))
+          (setq result (replace-regexp-in-string
+                        "^[ \t]*\\S-"
+                        (concat ind "\\&")
+                        (org-remove-indentation result)))))
+      (insert (concat (when keep-newline "\n") result)))))
 
 ;;;; Value results
 

test/jupyter-test.el

@@ -1393,120 +1393,139 @@ file:foo
 
 (ert-deftest jupyter-org-coalesce-stream-results ()
   :tags '(org)
-  (ert-info ("Synchronous")
+  (let ((org-edit-src-content-indentation 0))
-    (jupyter-org-test-src-block
+    (ert-info ("Synchronous")
-     "\
+      (jupyter-org-test-src-block
+       "\
 print(\"foo\")
 print(\"foo\", flush=True)
 print(\"foo\")"
-     "\
+       "\
 : foo
 : foo
 : foo"))
-  (ert-info ("Asynchronous")
+    (ert-info ("Asynchronous")
-    (ert-info ("Newline after first stream message")
-      (jupyter-org-test-src-block
-       "\
-print(\"foo\")
-print(\"foo\", flush=True)
-print(\"foo\")"
-       "\
-: foo
-: foo
-: foo"
-       :async "yes")
-      (jupyter-org-test-src-block
-       "\
-print(\"foo\", flush=True)
-print(\"foo\", end=\"\", flush=True)
-print(\"foo\")"
-       "\
-: foo
-: foofoo")
-      :async "yes")
-    (ert-info ("No newline after first stream message")
-      (jupyter-org-test-src-block
-       "\
-print(\"foo\")
-print(\"foo\", end=\"\", flush=True)
-print(\"bar\")"
-       "\
-: foo
-: foobar"
-       :async "yes"))
-    (ert-info ("Multiple newlines in appended stream message")
       (ert-info ("Newline after first stream message")
         (jupyter-org-test-src-block
          "\
 print(\"foo\")
 print(\"foo\", flush=True)
-print(\"bar\\nqux\")"
+print(\"foo\")"
          "\
 : foo
 : foo
-: bar
+: foo"
-: qux"
+         :async "yes")
-         :async "yes"))
+        (jupyter-org-test-src-block
+         "\
+print(\"foo\", flush=True)
+print(\"foo\", end=\"\", flush=True)
+print(\"foo\")"
+         "\
+: foo
+: foofoo")
+        :async "yes")
       (ert-info ("No newline after first stream message")
         (jupyter-org-test-src-block
          "\
 print(\"foo\")
 print(\"foo\", end=\"\", flush=True)
-print(\"bar\\nqux\")"
+print(\"bar\")"
          "\
 : foo
+: foobar"
+         :async "yes"))
+      (ert-info ("Multiple newlines in appended stream message")
+        (ert-info ("Newline after first stream message")
+          (jupyter-org-test-src-block
+           "\
+print(\"foo\")
+print(\"foo\", flush=True)
+print(\"bar\\nqux\")"
+           "\
+: foo
+: foo
+: bar
+: qux"
+           :async "yes"))
+        (ert-info ("No newline after first stream message")
+          (jupyter-org-test-src-block
+           "\
+print(\"foo\")
+print(\"foo\", end=\"\", flush=True)
+print(\"bar\\nqux\")"
+           "\
+: foo
 : foobar
 : qux"
-         :async "yes")))
+           :async "yes")))
-    (ert-info ("fixed-width to example-block promotion")
+      (ert-info ("fixed-width to example-block promotion")
-      (let ((org-babel-min-lines-for-block-output 2))
+        (let ((org-babel-min-lines-for-block-output 2))
-        (jupyter-org-test-src-block "print(\"z\")" ": z")
+          (jupyter-org-test-src-block "print(\"z\")" ": z")
-        (jupyter-org-test-src-block
-         "\
-print(\"z\", flush=True)
-print(\"z\")"
-         "\
-#+BEGIN_EXAMPLE
-z
-z
-#+END_EXAMPLE"
-         :async "yes")
-        (ert-info ("Appending after block promotion")
           (jupyter-org-test-src-block
            "\
 print(\"z\", flush=True)
-print(\"z\", flush=True)
 print(\"z\")"
            "\
 #+BEGIN_EXAMPLE
 z
 z
+#+END_EXAMPLE"
+           :async "yes")
+          (ert-info ("Appending after block promotion")
+            (jupyter-org-test-src-block
+             "\
+print(\"z\", flush=True)
+print(\"z\", flush=True)
+print(\"z\")"
+             "\
+#+BEGIN_EXAMPLE
+z
+z
 z
 #+END_EXAMPLE"
-           :async "yes"))
+             :async "yes"))
-        (ert-info ("Append to block with newline after first stream message")
+          (ert-info ("Append to block with newline after first stream message")
-          (jupyter-org-test-src-block
+            (jupyter-org-test-src-block
-           "\
+             "\
 print(\"z\\nz\", flush=True)
 print(\"z\")"
-           "\
+             "\
 #+BEGIN_EXAMPLE
 z
 z
 z
 #+END_EXAMPLE"
-           :async "yes"))
+             :async "yes"))
-        (ert-info ("Append to block without newline after first stream message")
+          (ert-info ("Append to block without newline after first stream message")
-          (jupyter-org-test-src-block
+            (jupyter-org-test-src-block
-           "\
+             "\
 print(\"z\\nz\", end=\"\", flush=True)
 print(\"z\")"
-           "\
+             "\
 #+BEGIN_EXAMPLE
 z
 zz
 #+END_EXAMPLE"
-           :async "yes"))))))
+             :async "yes")))))))
+
+
+(ert-deftest jupyter-org-example-block-indentation ()
+  :tags '(org)
+  (skip-unless (version<= "9.2" (org-version)))
+  (let ((org-babel-min-lines-for-block-output 2)
+        (org-edit-src-content-indentation 2))
+    (ert-info ("Appending obeys `org-edit-src-content-indentation'")
+      (jupyter-org-test-src-block
+       "\
+print(\"z\", flush=True)
+print(\"z\")"
+       "\
+#+BEGIN_EXAMPLE
+  z
+  z
+#+END_EXAMPLE"
+       :async "yes"))))
 
 (ert-deftest org-babel-jupyter-:dir-header-arg ()
   :tags '(org)

test/test-helper.el

@@ -354,9 +354,7 @@ results instead of an equality match."
 (defun jupyter-org-test-src-block-1 (code test-result &optional regexp args)
   (insert (jupyter-org-test-make-block code args))
   (let* ((info (org-babel-get-src-block-info))
-         (end (point-marker))
+         (end (point-marker)))
-         ;; Don't indent example-block results
-         (org-edit-src-content-indentation 0))
     (set-marker-insertion-type end t)
     (save-window-excursion
       (org-babel-execute-src-block nil info))