do not remove newlines in :pre :samp :code when generating orgx

Author: imakira

src/net/coruscation/cerulean/orgx/orgx.clj

@@ -95,12 +95,27 @@
   (loop [loc (zip/vector-zip hiccup)]
     (if (zip/end? loc)
       (zip/node loc)
-      (recur (zip/next
-              (if (and (string? (zip/node loc))
-                       (= (str/trim-newline (zip/node loc))
-                          ""))
-                (zip/remove loc)
-                loc))))))
+      (let [node (zip/node loc)]
+        (cond
+          ;; do not handle verbatim blocks
+	      (and (vector? node)
+               (or (= (first node)
+                      :pre)
+                   (= (first node)
+                      :node)
+                   (= (first node)
+                      :samp)))
+          (if (zip/right loc)
+            (recur (zip/right loc))
+            (zip/root loc))
+
+          (and (string? node)
+               (= (str/trim-newline node)
+                  ""))
+          (recur (zip/next (zip/remove loc)))
+
+          :else
+          (recur (zip/next loc)))))))
 
 (defn from-html [html]
   (let [results (->> (hickory.core/parse-fragment html)

test/net/coruscation/cerulean/orgx/orgx_test.clj

@@ -4,15 +4,20 @@
    [clojure.java.io :as io]
    [clojure.test :refer [deftest is testing]]
    [clojure.tools.logging :as log]
+   [hickory.core :as hc]
    [kaocha.classpath :as kaocha.classpath]
    [net.coruscation.cerulean.config :refer [join-workspace-path]]
-   [net.coruscation.cerulean.orgx.orgx :as sut]
+   [net.coruscation.cerulean.orgx.orgx :as sut :refer [remove-extra-newline]]
    [net.coruscation.cerulean.server.utils :refer [add-to-classpath path-join]]
    [net.coruscation.cerulean.test-constants :refer [resources-dir]]
    [net.coruscation.cerulean.test-utils :refer [with-temp-workspace]]))
 
 (defonce test-resources-dir (path-join resources-dir "orgx-test"))
 
+(defn html->hiccup [htmlstr]
+  (->> (hc/parse-fragment htmlstr)
+       (mapv hc/as-hiccup)))
+
 (deftest from-html-test
   (testing
       (let [[[ele] toplevels] (sut/from-html "<pre class=\"orgx\">  ($ :button {:on-click (fn [&amp; _] (js/alert &quot;clicked!&quot;))} &quot;Click Me&quot;) </pre>")]
@@ -23,8 +28,8 @@
 (deftest toplevesl-test
   (testing
       (let [[_ toplevels] (sut/from-html "<pre class=\"orgx\" data-toplevel> (defui demo []) </pre> ")]
-        (is (= (str toplevels)
-               (str '((defui demo []))))))))
+        (is (= (str '((defui demo [])))
+               (str toplevels))))))
 
 (deftest load-orgx-test
   (testing
@@ -42,3 +47,14 @@
         (require (symbol "orgx.demo") :reload)
         (is (= 10 (var-get (intern (find-ns (symbol "orgx.demo"))
                                    'a)))))))
+
+(deftest remove-extra-newline-test
+  (is (= [[:p {} [:b {} "hello"]]]
+         (remove-extra-newline (html->hiccup "<p>
+<b>hello</b>
+</p>"))))
+  (is (= [[:pre {} "\n" [:b {} "hello"] "\n"]]
+         (remove-extra-newline (html->hiccup "<pre>
+
+<b>hello</b>
+</pre>")))))