Raise element

README.md

@@ -41,6 +41,7 @@ vim.keymap.set('n', '<localleader>h', formedit.insertion.head, { desc = "Head in
 vim.keymap.set('n', '<localleader>H', formedit.insertion.tail, { desc = "Tail insert" })
 vim.keymap.set('n', '<localleader>i', formedit.wrap.head, { desc = "Wrap form " })
 vim.keymap.set('n', '<localleader>o', formedit.raise.form, { desc = "Raise form" })
+vim.keymap.set('n', '<localleader>O', formedit.raise.element, { desc = "Raise element" })
 vim.keymap.set('n', '>)', formedit.slurp.forward, { desc = "Slurp forward" })
 vim.keymap.set('n', '<(', formedit.slurp.backward, { desc = "Slurp backward" })
 vim.keymap.set('n', '>(', formedit.barf.backward, { desc = "Barf backward" })

fnl/formedit/find.fnl

@@ -30,6 +30,9 @@
   (let [count (form:named_child_count)]
     (form:child count)))
 
+;; Find element
+(fn element [] (ts.get_node_at_cursor))
+
 ;; Find node
 (fn form []
   (let [node (ts.get_node_at_cursor)]
@@ -39,4 +42,4 @@
   (let [node (ts.get_node_at_cursor)]
     (find-root-form node)))
 
-{: form : root : offset : first : last}
+{: form : root : offset : first : last : element}

fnl/formedit/raise.fnl

@@ -8,4 +8,11 @@
         [start-row start-col end-row end-col] [(parent:range)]]
     (vim.api.nvim_buf_set_text 0 start-row start-col end-row end-col [text])))
 
-{: form}
+(fn element []
+  (let [element (find.element)
+        parent (element:parent)
+        text (ts.get_node_text element 0)
+        [start-row start-col end-row end-col] [(parent:range)]]
+    (vim.api.nvim_buf_set_text 0 start-row start-col end-row end-col [text])))
+
+{: form : element}

fnl/spec/raise_spec.fnl

@@ -2,15 +2,27 @@
 (local h (require :spec.helper))
 (local raise (require :formedit.raise))
 
-(local keymap :<localleader>o)
+(local localleader ",")
+(local raise-form-keymap :<localleader>o)
+(local raise-element-keymap :<localleader>O)
+
 
 (describe :raise
           (fn []
             (before_each (fn []
-                           (set vim.g.maplocalleader keymap)
-                           (vim.keymap.set :n keymap raise.form)))
+                           (set vim.g.maplocalleader localleader)
+                           (vim.keymap.set :n raise-form-keymap raise.form)
+                           (vim.keymap.set :n raise-element-keymap
+                                           raise.element)))
             (it :form
                 (fn []
                   (h.setup {:content "(1 (2))" :cursor [1 4]})
-                  (h.feedkeys keymap)
-                  (h.expect {:content "(2)" :cursor [1 2]})))))
+                  (h.feedkeys raise-form-keymap)
+                  (h.expect {:content "(2)" :cursor [1 2]})))
+            (it :element
+                (fn []
+                  (h.setup {:content "(+ 1 (+ 2 3))" :cursor [1 8]})
+                  (h.feedkeys raise-element-keymap)
+                  (h.expect {:content "(+ 1 2)" :cursor [1 6]})))))
+
+(print "End")

script/bootstrap

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