a fix to indentation related to comma syntax; bump 0.1.13

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.12"]
+[cirru/writer "0.1.13"]
 ```
 
 ```clojure

examples/ast/nested-3.edn

@@ -0,0 +1 @@
+[["c" ["d" ["e"] [["a"] "d" ["f"] ["g"]]]]]

examples/cirru/nested-3.cirru

@@ -0,0 +1,5 @@
+
+c $ d (e)
+    a
+    , d (f)
+      g

examples/cirru/unfolding.cirru

@@ -2,8 +2,8 @@
 set
   add 1 $
   , x y
-  add 5 $
-  add 2
+    add 5 $
+    add 2
 
 a
   b (c d e) f

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cirru-writer-clj",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Cirru writer in Clojure",
   "main": "target/main.js",
   "directories": {
@@ -32,6 +32,6 @@
     "shortid": "^2.2.16"
   },
   "devDependencies": {
-    "shadow-cljs": "^2.11.18"
+    "shadow-cljs": "^2.11.23"
   }
 }

release.edn

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

src/cirru_writer/core.cljs

@@ -48,8 +48,8 @@
 
 (defn render-newline [x] (str "\n" (render-spaces x)))
 
-(defn generate-tree [expr insist-head? options level in-tail?]
-  (loop [acc "", exprs expr, head? true, prev-kind nil, bended? false]
+(defn generate-tree [expr insist-head? options base-level in-tail?]
+  (loop [acc "", exprs expr, head? true, prev-kind nil, bended-size 0, level base-level]
     (if (empty? exprs)
       acc
       (let [cursor (first exprs)
@@ -70,14 +70,7 @@
                     tail?
                       (if (empty? cursor)
                         "$"
-                        (str
-                         "$ "
-                         (generate-tree
-                          cursor
-                          false
-                          options
-                          (if bended? next-level level)
-                          tail?)))
+                        (str "$ " (generate-tree cursor false options level tail?)))
                     (= kind :leaf) (generate-leaf cursor)
                     (and head? insist-head?) (generate-inline-expr cursor)
                     (= kind :simple-expr)
@@ -111,17 +104,17 @@
                          (render-newline next-level))
                        (generate-tree cursor child-insist-head? options next-level false))
                     :else (throw (js/Error. "Unknown")))
+            bended? (and (= kind :leaf) (or (= prev-kind :expr) (= prev-kind :boxed-expr)))
             result (cond
                      tail? (str char-space child)
                      (and (= prev-kind :leaf) (= kind :leaf)) (str char-space child)
                      (and (= prev-kind :leaf) (= kind :simple-expr)) (str char-space child)
                      (and (= prev-kind :simple-expr) (= kind :leaf)) (str char-space child)
-                     (and (= kind :leaf) (or (= prev-kind :expr) (= prev-kind :boxed-expr)))
-                       (str (render-newline next-level) ", " child)
+                     bended? (str (render-newline next-level) ", " child)
                      :else child)]
         (comment
          do
-         (println "loop:" prev-kind kind head? insist-head?)
+         (println "loop:" prev-kind kind head? insist-head? level bended-size)
          (println "    =>" (pr-str acc))
          (println "    =>" exprs)
          (println "    =>" (pr-str child)))
@@ -136,7 +129,8 @@
                (if (contains? #{:leaf :simple-expr} prev-kind) :simple-expr :expr)
                (if (= prev-kind :leaf) :simple-expr :expr)))
            kind)
-         (or bended? (or (= kind :expr) (= kind :boxed-expr))))))))
+         (if bended? (inc bended-size) bended-size)
+         (if bended? next-level level))))))
 
 (defn generate-statements [exprs options]
   (->> exprs

src/cirru_writer/test.cljs

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