Handle slurp set

README.md

@@ -1,16 +1,35 @@
 # Form edit
 
-Paredit in fennel
+Paredit in Fennel for Clojure
 
-## Getting started
+## 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
+  - Bring in element/form into your form
+- Raise
+  - Remove parent form and replace with current form
+- Wrap
+  - Add form around current form
+- Insertion
+  - Move cursor to begining/end for form in insert mode
+
+## Todo
+
+- [ ] - Inner select
+- [ ] - Barf
+
+## Dev Getting started
 
 ```bash
 ./scripts/nfnl   # To download nfnl
+just test   # Run tests
+just watch {featuer}   # Run watch tests for feature
 ```
 
-[ ] - inner select - Get all named value children on form
-[ ] - slurp/barf - ?
-
 ## Unlicensed
 
 Find the full [Unlicense][unlicense] in the `UNLICENSE` file, but here's a

fnl/formedit/slurp.fnl

@@ -16,8 +16,10 @@
 (fn backward []
   (let [form (find.form)
         [row col] [(form:start)]
+        type (form:type)
+        offset (. find.insert-offset type)
+        col (+ col offset)
         sibling (form:prev_sibling)
-        col (+ col 1)
         sibling-text (ts.get_node_text sibling 0)
         sibling-text (.. sibling-text " ")
         [sibling-row-start sibling-col-start sibling-row-end sibling-col-end] [(sibling:range)]]

fnl/spec/slurp_spec.fnl

@@ -18,7 +18,12 @@
                 (fn []
                   (h.setup {:content "((1) (+ 2 3))" :cursor [1 1]})
                   (h.feedkeys forward-keymap)
-                  (h.expect {:content "((1 (+ 2 3)))" :cursor [1 1]})))))
+                  (h.expect {:content "((1 (+ 2 3)))" :cursor [1 1]})))
+            (it :set
+                (fn []
+                  (h.setup {:content "(#{1} 2)" :cursor [1 1]})
+                  (h.feedkeys forward-keymap)
+                  (h.expect {:content "(#{1 2})" :cursor [1 1]})))))
 
 
 (describe "slurp backwards"
@@ -34,4 +39,9 @@
                 (fn []
                   (h.setup {:content "((1) (+ 2 3))" :cursor [1 5]})
                   (h.feedkeys backward-keymap)
-                  (h.expect {:content "(((1) + 2 3))" :cursor [1 5]})))))
+                  (h.expect {:content "(((1) + 2 3))" :cursor [1 5]})))
+            (it :set
+                (fn []
+                  (h.setup {:content "(1 #{2})" :cursor [1 3]})
+                  (h.feedkeys backward-keymap)
+                  (h.expect {:content "(#{1 2})" :cursor [1 3]})))))