update readme

docs/sample.clj

@@ -1,8 +1,73 @@
-(+ 1 2 3)
-[1 2 3]
-#{1 2 3 (+ 2 (+ 1 2))}
+; TODO: Broken
+; barf forward
+; cxt: cursor within 1st form
+; key: <)
+; expected: (+ 1 (+ 2) 3)
+(+ 1 (+ 2 3))
 
-(+ 1 (+ 2 3 4))
+; TODO: Broken
+; barf backwards
+; cxt: cursor within 1st form
+; key: >(
+; expected: (+ 1 + (2 3))
+(+ 1 (+ 2 3))
 
-(defn foo [x] x)
-(defn bar [x] x)
+; Wrap form
+; cxt: cursor within
+; key: <localleader>i
+; expected: (| (+ 2 3)) *insert mode*
+(+ 2 3)
+
+; slurp forward
+; cxt: cursor within 1st form
+; key: >)
+; expected: ((+ 1 2 3))
+((+ 1 2) 3)
+
+; slurp backward
+; cxt: cursor within 1st form
+; key: <(
+; expected: (+ (1 + 2 3))
+(+ 1 (+ 2 3))
+
+; raise form
+; cxt: cursor within 1st form
+; key: <localleader>o
+; expected: (+ 2 3)
+(+ 1 (+ 2 3))
+
+; Text object inner
+; cxt: cursor within form
+; key: dif
+; expected: ()
+(+ 2 3)
+
+; Text object root inner
+; cxt: cursor within second form
+; key: diF
+; expected: ()
+(+ 2 (+ 3))
+
+; Text object outer
+; cxt: cursor within second form
+; key: daf
+; expected: (+ 2 )
+(+ 2 (+ 3 4))
+
+; Text object root outer
+; cxt: cursor within second form
+; key: daF
+; expected: _
+(+ 2 3)
+
+; Insert head
+; cxt: cursor within
+; key: <localleader>h
+; expected: (| + 2 3) *insert mode*
+(+ 2 3)
+
+; Insert tail
+; cxt: cursor within
+; key: <localleader>H
+; expected: (+ 2 3 |) *insert mode*
+(+ 2 3)

fnl/formedit/insertion.fnl

@@ -6,14 +6,15 @@
         [start-row start-col] [(form:start)]
         start-col (+ start-col offset)]
     (vim.api.nvim_buf_set_text 0 start-row start-col start-row start-col [" "])
-    (vim.api.nvim_win_set_cursor 0 [(+ start-row 1) (+ start-col 1)])
+    (vim.api.nvim_win_set_cursor 0 [(+ start-row 1) start-col])
     (vim.api.nvim_feedkeys :i :n true)))
 
 (fn tail []
   (let [form (find.form)
         [end-row end-col] [(form:end_)]
         end-col (- end-col 1)]
     (vim.api.nvim_buf_set_text 0 end-row end-col end-row end-col [" "])
+    (vim.api.nvim_win_set_cursor 0 [(+ end-row 1) end-row])
     (vim.api.nvim_feedkeys :i :n true)))
 
 {: head : tail}

fnl/formedit/wrap.fnl

@@ -6,7 +6,7 @@
         [start-row start-col end-row end-col] [(form:range)]]
     (vim.api.nvim_buf_set_text 0 end-row end-col end-row end-col [")"])
     (vim.api.nvim_buf_set_text 0 start-row start-col start-row start-col ["( "])
-    (vim.api.nvim_win_set_cursor 0 [(+ start-row 1) (+ start-col offset 1)])
+    (vim.api.nvim_win_set_cursor 0 [(+ start-row 1) (+ start-col offset)])
     (vim.api.nvim_feedkeys :i :n true)))
 
 {: head}

fnl/spec/insertion_spec.fnl

@@ -14,17 +14,17 @@
                 (fn []
                   (h.setup {:content "(1)" :cursor [1 0]})
                   (h.feedkeys head-keymap)
-                  (h.expect {:content "( 1)" :cursor [1 1]})))
+                  (h.expect {:content "( 1)" :cursor [1 0]})))
             (it :set
                 (fn []
                   (h.setup {:content "#{1}" :cursor [1 0]})
                   (h.feedkeys head-keymap)
-                  (h.expect {:content "#{ 1}" :cursor [1 2]})))
+                  (h.expect {:content "#{ 1}" :cursor [1 1]})))
             (it "sub form"
                 (fn []
                   (h.setup {:content "(1 (2))" :cursor [1 3]})
                   (h.feedkeys head-keymap)
-                  (h.expect {:content "(1 ( 2))" :cursor [1 4]})))))
+                  (h.expect {:content "(1 ( 2))" :cursor [1 3]})))))
 
 (describe "tail insertion"
           (fn []
@@ -35,9 +35,11 @@
                 (fn []
                   (h.setup {:content "(1)" :cursor [1 0]})
                   (h.feedkeys tail-keymap)
-                  (h.expect {:content "(1 )" :cursor [1 0]})))
+                  (h.expect {:content "(1 )" :cursor [1 3]})))
             (it :sub
                 (fn []
-                  (h.setup {:content "(1 (2))" :cursor [1 4]})
+                  (h.setup {:content "(1 (2))" :cursor [1 3]})
                   (h.feedkeys tail-keymap)
-                  (h.expect {:content "(1 (2 ))" :cursor [1 3]})))))
+                  (h.expect {:content "(1 (2 ))" :cursor [1 6]})))))
+
+(print "foo")

fnl/spec/wrap_spec.fnl

@@ -13,9 +13,11 @@
                 (fn []
                   (h.setup {:content "(1)" :cursor [1 0]})
                   (h.feedkeys keymap)
-                  (h.expect {:content "( (1))" :cursor [1 1]})))
+                  (h.expect {:content "( (1))" :cursor [1 0]})))
             (it "sub form"
                 (fn []
                   (h.setup {:content "(1 (2))" :cursor [1 3]})
                   (h.feedkeys keymap)
-                  (h.expect {:content "(1 ( (2)))" :cursor [1 4]})))))
+                  (h.expect {:content "(1 ( (2)))" :cursor [1 3]})))))
+
+