tree traversal

grierson · Aug 11, 2023 · 557513e · 557513e
1 parent 2200893
commit 557513e
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 90 deletions.
diff --git a/docs/sample.clj b/docs/sample.clj
@@ -0,0 +1,2 @@
+(defn foo [x y]
+  (+ x (+ y 1)))
diff --git a/fnl/formedit/api/motion.fnl b/fnl/formedit/api/motion.fnl
diff --git a/fnl/formedit/init.fnl b/fnl/formedit/init.fnl
diff --git a/fnl/formedit/tree.fnl b/fnl/formedit/tree.fnl
@@ -0,0 +1,13 @@
+(local forms {:list_lit true
+              :vec_lit true
+              :map_lit true
+              :set_lit true
+              :anon_fn_lit true})
+
+(fn form? [node]
+  (if (. forms (node:type))
+      node
+      (let [child (node:named_child 0)]
+        (when child (form? child)))))
+
+{: form?}
diff --git a/fnl/spec/nfnl/api/motion/motion_spec.fnl b/fnl/spec/nfnl/api/motion/motion_spec.fnl
diff --git a/fnl/spec/nfnl/helper.fnl b/fnl/spec/nfnl/helper.fnl
@@ -4,7 +4,8 @@
 (fn setup [{: cursor : content}]
   (vim.api.nvim_buf_set_option 0 :filetype :clojure)
   (vim.api.nvim_buf_set_lines 0 0 -1 true [content])
-  (vim.api.nvim_win_set_cursor 0 cursor))
+  (vim.api.nvim_win_set_cursor 0 cursor)
+  (: (vim.treesitter.get_parser 0) :parse))
 
 (fn expect [{: cursor : content}]
   (when content
@@ -13,4 +14,4 @@
   (when cursor
     (assert.are.same cursor (vim.api.nvim_win_get_cursor 0))))
 
-{: setup : expect}
+{: setup : expect : feedkeys}
diff --git a/fnl/spec/nfnl/tree/tree_spec.fnl b/fnl/spec/nfnl/tree/tree_spec.fnl
@@ -0,0 +1,14 @@
+(local {: describe : it} (require :plenary.busted))
+(local h (require :spec.nfnl.helper))
+(local tree (require :formedit.tree))
+(local assert (require :luassert.assert))
+(local ts (require :nvim-treesitter.ts_utils))
+
+(describe "node under cursor"
+          (fn []
+            (it "cursor on start of form"
+                (fn []
+                  (h.setup {:content "(a)" :cursor [1 2]})
+                  (let [node (ts.get_node_at_cursor)
+                        actual (tree.form? node)]
+                    (assert.equals :list_lit (actual:type)))))))
diff --git a/lua/formedit/api/motion.lua b/lua/formedit/api/motion.lua
diff --git a/lua/formedit/tree.lua b/lua/formedit/tree.lua
diff --git a/lua/spec/nfnl/api/motion/motion_spec.lua b/lua/spec/nfnl/api/motion/motion_spec.lua
diff --git a/lua/spec/nfnl/cursor_spec.lua b/lua/spec/nfnl/cursor_spec.lua
diff --git a/lua/spec/nfnl/helper.lua b/lua/spec/nfnl/helper.lua
diff --git a/lua/spec/nfnl/tree/tree_spec.lua b/lua/spec/nfnl/tree/tree_spec.lua