Merge pull request #174 from mainej/root-node-span

Fix end position on root node of untracked zipper

Author: lread

src/rewrite_clj/parser.cljc

@@ -23,11 +23,11 @@
   "Parse all forms from the given reader."
   [#?(:cljs ^not-native reader :default reader)]
   (let [nodes (->> (repeatedly #(parse reader))
-                   (take-while identity)
-                   (doall))]
-    (with-meta
-      (nforms/forms-node nodes)
-      (meta (first nodes)))))
+                   (take-while identity))
+        position-meta (merge (meta (first nodes))
+                             (select-keys (meta (last nodes))
+                                          [:end-row :end-col]))]
+    (with-meta (nforms/forms-node nodes) position-meta)))
 
 ;; ## Specialized Parsers
 

test/rewrite_clj/parser_test.cljc

@@ -541,7 +541,18 @@
       [2 4]  [2 5]  :token  "x"            'x
       [3 3]  [3 14] :list   "(println x)"  '(println x)
       [3 4]  [3 11] :token  "println"      'println
-      [3 12] [3 13] :token  "x"            'x)))
+      [3 12] [3 13] :token  "x"            'x))
+  ;; root node
+  (let [s (str
+           ;1234567890
+           "(def a 1)\n"
+           "(def b\n"
+           "  2)")
+        n (p/parse-string-all s)
+        start-pos ((juxt :row :col) (meta n))
+        end-pos ((juxt :end-row :end-col) (meta n))]
+    (is (= [1 1] start-pos))
+    (is (= [3 5] end-pos))))
 
 
 (deftest t-os-specific-line-endings

test/rewrite_clj/zip_test.cljc

@@ -58,7 +58,18 @@
       [2 4]  [2 5]  :token  "x"            'x
       [3 3]  [3 14] :list   "(println x)"  '(println x)
       [3 4]  [3 11] :token  "println"      'println
-      [3 12] [3 13] :token  "x"            'x)))
+      [3 12] [3 13] :token  "x"            'x))
+  ;; root node
+  (let [s (str
+           ;1234567890
+           "(def a 1)\n"
+           "(def b\n"
+           "  2)")
+        [start-pos end-pos] (-> (z/of-string s {:track-position? true})
+                                z/up
+                                z/position-span)]
+    (is (= [1 1] start-pos))
+    (is (= [3 5] end-pos))))
 
 (deftest namespaced-keywords
   (is (= ":dill" (-> ":dill" z/of-string z/root-string)))