Find root form

README.md

@@ -8,9 +8,9 @@ Paredit in fennel
 ./scripts/nfnl   # To download nfnl
 ```
 
-[ ] - inner select
-[ ] - root select
-[ ] - slurp/barf
+[ ] - inner select - Get all named value children on form
+[ ] - root select - Is form and on column 0
+[ ] - slurp/barf - ?
 
 ## Unlicensed
 

docs/sample.clj

@@ -2,5 +2,7 @@
 [1 2 3]
 #{1 2 3 (+ 2 (+ 1 2))}
 
+(+ 1 (+ 2 3 4))
+
 (defn foo [x] x)
 (defn bar [x] x)

fnl/formedit/find.fnl

@@ -26,9 +26,12 @@
         (when parent (find-current-form parent)))))
 
 (fn find-root-form [node]
-  (if (node:parent)
-      (find-root-form (node:parent))
-      node))
+  (let [[_ col] [(node:start)]
+        type (node:type)]
+    (if (and (. forms type) (= col 0))
+        node
+        (when (node:parent)
+          (find-root-form (node:parent))))))
 
 ;; Find node
 (fn form []

fnl/spec/delete_around_spec.fnl

@@ -56,8 +56,13 @@
                   (h.setup {:content "(+ 1 (+ 2 3))" :cursor [1 7]})
                   (h.feedkeys :daF)
                   (h.expect {:content "" :cursor [1 0]})))
-            (it "cursor in sub form deletes root"
+            (it "only deletes root form that cursor is in"
                 (fn []
-                  (h.setup {:content "(+ 1 (+ 2 3))" :cursor [1 7]})
+                  (h.setup {:content ["(+ 1 2)" "(+ 3 4)"] :cursor [1 0]})
+                  (h.feedkeys :daF)
+                  (h.expect {:content ["" "(+ 3 4)"] :cursor [1 0]})))
+            (it "only deletes root form that cursor is in second form"
+                (fn []
+                  (h.setup {:content ["(+ 1 2)" "(+ 3 4)"] :cursor [2 0]})
                   (h.feedkeys :daF)
-                  (h.expect {:content "" :cursor [1 0]})))))
+                  (h.expect {:content ["(+ 1 2)" ""] :cursor [2 0]})))))

fnl/spec/helper.fnl

@@ -15,8 +15,11 @@
 
 (fn expect [{: cursor : content}]
   (when content
-    (assert.are.same content
-                     (core.first (vim.api.nvim_buf_get_lines 0 0 10 false))))
+    (assert.are.same content (let [text (vim.api.nvim_buf_get_lines 0 0 10
+                                                                    false)]
+                               (if (= (core.count text) 1)
+                                   (core.first text)
+                                   text))))
   (when cursor
     (assert.are.same cursor (vim.api.nvim_win_get_cursor 0))))