Wrap and insertion

README.md

@@ -8,6 +8,12 @@ Paredit in fennel
 ./scripts/nfnl   # To download nfnl
 ```
 
+## Todo
+
+- [ ] Outer root deletes everything
+- [ ] insert head cursor off by one to the left
+- [ ] wrap cursor off by one to the left
+
 ## Unlicensed
 
 Find the full [Unlicense][unlicense] in the `UNLICENSE` file, but here's a

docs/sample.clj

@@ -1,3 +1,10 @@
+(defn foo [x y]
+  (+ x y))
+
+(defn bar [x y]
+  (+ x y))
+
 (+ 1 2 3)
+'(1 2 3)
 [1 2 3]
 #{1 2 3}

fnl/formedit/find.fnl

@@ -6,6 +6,18 @@
               :set_lit true
               :anon_fn_lit true})
 
+(local start-offset {:list_lit 0
+                     :vec_lit 0
+                     :map_lit 0
+                     :set_lit 1
+                     :anon_fn_lit 1})
+
+(local insert-offset {:list_lit 1
+                      :vec_lit 1
+                      :map_lit 1
+                      :set_lit 2
+                      :anon_fn_lit 2})
+
 ;; Tree search
 (fn find-current-form [node]
   (if (. forms (node:type))
@@ -33,4 +45,4 @@
 ;         [end-row end-col] [(: (. (form:field :close) 1) :start)]]
 ;     [open-row open-col end-row end-col]))
 
-{: form : root}
+{: form : root : insert-offset : start-offset}

fnl/formedit/init.fnl

@@ -0,0 +1,6 @@
+(local find (require :formedit.find))
+(local insertion (require :formedit.insertion))
+(local select (require :formedit.select))
+(local wrap (require :formedit.wrap))
+
+{: find : insertion : select : wrap}

fnl/formedit/insertion.fnl

@@ -6,10 +6,12 @@
 
 (fn head []
   (let [form (find.form)
+        start-offset (. find.start-offset (form:type))
+        insert-offset (. find.start-offset (form:type))
         [start-row start-col _ _] (range form)]
-    (vim.api.nvim_win_set_cursor 0 [start-row start-col])
+    (vim.api.nvim_win_set_cursor 0 [start-row (+ start-col start-offset)])
     (vim.api.nvim_command "normal! a ")
-    (vim.api.nvim_win_set_cursor 0 [start-row start-col])
+    (vim.api.nvim_win_set_cursor 0 [start-row (+ start-col insert-offset)])
     (vim.api.nvim_feedkeys :i :n true)))
 
 (fn tail []

fnl/formedit/wrap.fnl

@@ -4,14 +4,15 @@
   (let [[start-row start-col end-row end-col] [(form:range)]]
     [(+ start-row 1) start-col (+ end-row 1) end-col]))
 
-(fn form-head []
+(fn head []
   (let [form (find.form)
+        insert-offset (. find.start-offset (form:type))
         [start-row start-col end-row end-col] (range form)]
     (vim.api.nvim_win_set_cursor 0 [end-row end-col])
     (vim.api.nvim_command "normal! i)")
     (vim.api.nvim_win_set_cursor 0 [start-row start-col])
     (vim.api.nvim_command "normal! i( ")
-    (vim.api.nvim_win_set_cursor 0 [start-row start-col])
+    (vim.api.nvim_win_set_cursor 0 [start-row (+ start-col insert-offset)])
     (vim.api.nvim_feedkeys :i :n true)))
 
-{: form-head}
+{: head}

fnl/spec/insertion_spec.fnl

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

fnl/spec/wrap_form_spec.fnl → fnl/spec/wrap_spec.fnl

@@ -8,7 +8,7 @@
           (fn []
             (before_each (fn []
                            (set vim.g.maplocalleader keymap)
-                           (vim.keymap.set :n keymap wrap.form-head)))
+                           (vim.keymap.set :n keymap wrap.head)))
             (it "form head"
                 (fn []
                   (h.setup {:content "(1)" :cursor [1 0]})

script/bootstrap

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+script/fennel.bb --compile

script/bootstrap-dev

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+script/fennel.bb --files | entr script/fennel.bb --compile