Merge pull request #16 from Cirru/empty-line

reduce extra empty line

.github/workflows/upload.yaml

@@ -36,7 +36,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-clojars
 
-      - run: yarn && yarn build
+      - run: yarn && yarn test && yarn build
         name: Build web assets
 
       - name: Deploy to server

README.md

@@ -11,7 +11,7 @@ Demo http://repo.cirru.org/writer.clj/
 [![Clojars Project](https://img.shields.io/clojars/v/cirru/writer.svg)](https://clojars.org/cirru/writer)
 
 ```clojure
-[cirru/writer "0.1.11"]
+[cirru/writer "0.1.12"]
 ```
 
 ```clojure

examples/ast/cond-short.edn

@@ -0,0 +1,3 @@
+[
+["cond", [["a"], "c"], [["d"]]]
+]

examples/cirru/cond-short.cirru

@@ -0,0 +1,5 @@
+
+cond
+    a
+    , c
+  (d)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cirru-writer-clj",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "description": "Cirru writer in Clojure",
   "main": "target/main.js",
   "directories": {

release.edn

@@ -1,4 +1,4 @@
-{:version "0.1.11",
+{:version "0.1.12",
  :group-id "cirru",
  :artifact-id "writer",
  :skip-tag true,

src/cirru_writer/core.cljs

@@ -50,12 +50,6 @@
 
 (defn generate-tree [expr insist-head? options level in-tail?]
   (loop [acc "", exprs expr, head? true, prev-kind nil, bended? false]
-    (comment
-     do
-     (println "loop:" prev-kind head?)
-     (println "    =>" (pr-str acc))
-     (println "    =>" exprs)
-     (println "    =>" head? insist-head?))
     (if (empty? exprs)
       acc
       (let [cursor (first exprs)
@@ -101,9 +95,15 @@
                             next-level
                             false)))
                     (= kind :expr)
-                      (str
-                       (render-newline next-level)
-                       (generate-tree cursor child-insist-head? options next-level false))
+                      (let [content (generate-tree
+                                     cursor
+                                     child-insist-head?
+                                     options
+                                     next-level
+                                     false)]
+                        (if (string/starts-with? content "\n")
+                          content
+                          (str (render-newline next-level) content)))
                     (= kind :boxed-expr)
                       (str
                        (if (contains? #{:leaf :simple-expr nil} prev-kind)
@@ -119,6 +119,12 @@
                      (and (= kind :leaf) (or (= prev-kind :expr) (= prev-kind :boxed-expr)))
                        (str (render-newline next-level) ", " child)
                      :else child)]
+        (comment
+         do
+         (println "loop:" prev-kind kind head? insist-head?)
+         (println "    =>" (pr-str acc))
+         (println "    =>" exprs)
+         (println "    =>" (pr-str child)))
         (recur
          (if (empty? acc) result (str acc result))
          (rest exprs)

src/cirru_writer/test.cljs

@@ -17,6 +17,15 @@
     (is (= (parse expected) data))
     (is (= (write-code data) expected)))))
 
+(deftest
+ cond-short-test
+ (let [data (read-string (slurp "examples/ast/cond-short.edn"))
+       expected (slurp "examples/cirru/cond-short.cirru")]
+   (testing
+    "writing case for shorter cond"
+    (is (= (parse expected) data))
+    (is (= (write-code data) expected)))))
+
 (deftest
  cond-test
  (let [data (read-string (slurp "examples/ast/cond.edn"))