barf

README.md

@@ -1,14 +1,14 @@
 # Form edit
 
-Paredit in Fennel for Clojure
+Paredit in Fennel for Clojure using Treesitter
 
 ## Features
 
 - Form text objects
   - Lists (s-exp, quoted list), vector, set are all under one text object
   - so instead of `di(` `di[` `di{` just `dif` (or any other text object command)
   - `f` for current form. `F` for root form
-- Slurp
+- Slurp (Forward + Backwards)
   - Bring in element/form into your form
 - Raise
   - Remove parent form and replace with current form

fnl/formedit/barf.fnl

@@ -0,0 +1,27 @@
+(local find (require :formedit.find))
+(local ts (require :vim.treesitter))
+
+(fn forward []
+  (let [form (find.form)
+        last (find.last form)
+        [row col] [(form:end_)]
+        [last-row-start last-col-start last-row-end last-col-end] [(last:range)]
+        text (ts.get_node_text last 0)
+        text (.. " " text)]
+    (vim.api.nvim_buf_set_text 0 row col row col [text])
+    (vim.api.nvim_buf_set_text 0 last-row-start (- last-col-start 1)
+                               last-row-end last-col-end [""])))
+
+(fn backward []
+  (let [form (find.form)
+        first (find.first form)
+        text (ts.get_node_text first 0)
+        text (.. text " ")
+        [row-start col-start row-end col-end] [(first:range)]
+        _ (vim.api.nvim_buf_set_text 0 row-start col-start row-end
+                                     (+ col-end 1) [""])
+        nform (find.form)
+        [nrow-start ncol-start] [(nform:start)]]
+    (vim.api.nvim_buf_set_text 0 nrow-start ncol-start nrow-start ncol-start [text])))
+
+{: forward : backward}

fnl/formedit/find.fnl

@@ -33,6 +33,13 @@
         (when (node:parent)
           (find-root-form (node:parent))))))
 
+(fn first [form]
+  (form:named_child 0))
+
+(fn last [form]
+  (let [count (form:named_child_count)]
+    (form:child count)))
+
 ;; Find node
 (fn form []
   (let [node (ts.get_node_at_cursor)]
@@ -42,4 +49,4 @@
   (let [node (ts.get_node_at_cursor)]
     (find-root-form node)))
 
-{: form : root : insert-offset : start-offset}
+{: form : root : insert-offset : start-offset : first : last}

fnl/spec/barf_spec.fnl

@@ -0,0 +1,36 @@
+(local {: describe : it : before_each} (require :plenary.busted))
+(local h (require :spec.helper))
+(local barf (require :formedit.barf))
+
+(local forward-keymap "<)")
+(local backward-keymap ">(")
+
+(describe "barf forward"
+          (fn []
+            (before_each (fn []
+                           (vim.keymap.set :n forward-keymap barf.forward)))
+            (it :element
+                (fn []
+                  (h.setup {:content "((1 2))" :cursor [1 1]})
+                  (h.feedkeys forward-keymap)
+                  (h.expect {:content "((1) 2)" :cursor [1 1]})))
+            (it :form
+                (fn []
+                  (h.setup {:content "(((1) (2)))" :cursor [1 1]})
+                  (h.feedkeys forward-keymap)
+                  (h.expect {:content "(((1)) (2))" :cursor [1 1]})))))
+
+(describe "barf backwards"
+          (fn []
+            (before_each (fn []
+                           (vim.keymap.set :n backward-keymap barf.backward)))
+            (it :element
+                (fn []
+                  (h.setup {:content "((1 2))" :cursor [1 1]})
+                  (h.feedkeys backward-keymap)
+                  (h.expect {:content "(1 (2))" :cursor [1 1]})))
+            (it :form
+                (fn []
+                  (h.setup {:content "(((1) 2))" :cursor [1 1]})
+                  (h.feedkeys backward-keymap)
+                  (h.expect {:content "((1) (2))" :cursor [1 1]})))))