Merge pull request #34 from eraserhd/whitespace_aware_insertion

fix insertion at leftmost/rightmost position.

Author: Yannick Scherer

src/rewrite_clj/zip/insert.clj

@@ -14,9 +14,12 @@
   [move-fn insert-fn prefix zloc item]
   (let [item-node (node/coerce item)
         next-node (move-fn zloc)]
-    (->> (if (or (not next-node) (ws/whitespace? next-node))
-           (concat [item-node] prefix)
-           (concat [space item-node] prefix))
+    (->> (concat
+           (if (and next-node (not (ws/whitespace? next-node)))
+             [space])
+           [item-node]
+           (if (not (ws/whitespace? zloc))
+             prefix)) 
          (reduce insert-fn zloc))))
 
 (defn insert-right

test/rewrite_clj/zip/insert_test.clj

@@ -10,26 +10,29 @@
   (fact "about whitespace-aware insertion."
         (let [elements (->> (base/of-string
                               (format ?fmt "1 2 3 4"))
-                            (iterate m/next))
+                            (iterate ?m))
               loc (nth elements ?n)
               loc' (?f loc 'x)]
           (base/tag loc) => (base/tag loc')
           (base/root-string loc') => ?s))
-  ?fmt      ?n   ?f               ?s
-  "[%s]"    0    insert-right     "[1 2 3 4] x"
-  "[%s]"    1    insert-right     "[1 x 2 3 4]"
-  "[%s]"    2    insert-right     "[1 2 x 3 4]"
-  "[%s]"    3    insert-right     "[1 2 3 x 4]"
-  "[%s]"    4    insert-right     "[1 2 3 4 x]"
-  "[%s]"    0    insert-left      "x [1 2 3 4]"
-  "[%s]"    1    insert-left      "[x 1 2 3 4]"
-  "[%s]"    2    insert-left      "[1 x 2 3 4]"
-  "[%s]"    3    insert-left      "[1 2 x 3 4]"
-  "[%s]"    4    insert-left      "[1 2 3 x 4]"
-  "[%s]"    0    insert-child     "[x 1 2 3 4]"
-  "[%s]"    0    append-child     "[1 2 3 4 x]"
-  "[ %s]"   0    insert-child     "[x 1 2 3 4]"
-  "[%s ]"   0    append-child     "[1 2 3 4 x]")
+  ?fmt     ?m         ?n   ?f               ?s
+  "[%s]"   m/next     0    insert-right     "[1 2 3 4] x"
+  "[%s]"   m/next     1    insert-right     "[1 x 2 3 4]"
+  "[%s]"   m/next     2    insert-right     "[1 2 x 3 4]"
+  "[%s]"   m/next     3    insert-right     "[1 2 3 x 4]"
+  "[%s]"   m/next     4    insert-right     "[1 2 3 4 x]"
+  "[%s]"   m/next     0    insert-left      "x [1 2 3 4]"
+  "[%s]"   m/next     1    insert-left      "[x 1 2 3 4]"
+  "[%s]"   m/next     2    insert-left      "[1 x 2 3 4]"
+  "[%s]"   m/next     3    insert-left      "[1 2 x 3 4]"
+  "[%s]"   m/next     4    insert-left      "[1 2 3 x 4]"
+  "[%s]"   m/next     0    insert-child     "[x 1 2 3 4]"
+  "[%s]"   m/next     0    append-child     "[1 2 3 4 x]"
+  "[ %s]"  m/next     0    insert-child     "[x 1 2 3 4]"
+  "[%s ]"  m/next     0    append-child     "[1 2 3 4 x]"
+  "[%s]"   z/next     2    insert-right     "[1 x 2 3 4]"
+  "\n[%s]" z/leftmost 1    insert-left      "x\n[1 2 3 4]"
+  "\n[%s]" z/leftmost 1    insert-right     "\nx [1 2 3 4]")
 
 (tabular
   (fact "about different node types that allow insertion."