Top form eval (#58)

* Allow top extracting top form

* Add 'cpt' mapping for evaluating current top form

Author: hkupty

API.md

@@ -167,9 +167,11 @@ Refactor the current file so the `(:require ...)` form is sorted.
 # acid.forms
 Forms extraction
 
-## `acid.forms.get_form_boundaries()`
+## `acid.forms.get_form_boundaries([top])`
 Returns the coordinates for the boundaries of the current form
 
+*top* **(boolean)**: if true, recursively searches for top level.
+
 
 **(table)** coordinates {from = {row,col}, to = {row,col}}
 

lua/acid/features.lua

@@ -62,6 +62,9 @@ features.eval_expr = function(mode, ns)
     payload.code = table.concat(form, "\n")
   elseif mode == "symbol" then
     payload.code = forms.symbol_under_cursor()
+  elseif mode == "top" then
+    local form = forms.form_under_cursor(true)
+    payload.code = table.concat(form, "\n")
   else
     local lines = forms.form_from_motion(mode)
     payload.code = table.concat(lines, "\n")

lua/acid/forms.lua

@@ -5,14 +5,16 @@
 local forms = {}
 
 --- Returns the coordinates for the boundaries of the current form
+-- @tparam[opt] boolean top if true, recursively searches for top level.
 -- @treturn table coordinates {from = {row,col}, to = {row,col}}
-forms.get_form_boundaries = function()
+forms.get_form_boundaries = function(top)
+  -- TODO Update once tree-sitter
   local to_filter, from_filter
   local curpos = vim.api.nvim_call_function("getcurpos", {})
   local last_parens = vim.api.nvim_call_function("strcharpart", {
       vim.api.nvim_call_function("getline", {curpos[2]}),
       curpos[3] - 1, 1
-  })
+    })
 
   if last_parens == ")" then
     to_filter = "nc"
@@ -22,6 +24,11 @@ forms.get_form_boundaries = function()
     from_filter = "nbc"
   end
 
+  if top then
+    to_filter = to_filter .. "r"
+    from_filter = from_filter .. "r"
+  end
+
   local to = vim.api.nvim_call_function("searchpairpos", {"(", "", ")", to_filter})
   local from = vim.api.nvim_call_function("searchpairpos", {"(", "", ")", from_filter})
 

plugin/acid.vim

@@ -73,14 +73,15 @@ function! AcidJobHandler(id, data, stream)
   call luaeval('require("acid.nrepl").handle[_A[1]](_A[2], _A[3])', [a:stream, a:data, a:id])
 endfunction
 
-map <Plug>(acid-go-to)        <Cmd>lua require("acid.features").go_to()<CR>
-map <Plug>(acid-docs)         <Cmd>lua require("acid.features").docs()<CR>
-map <Plug>(acid-eval-cmdline) <Cmd>call AcidSendEval("eval_cmdline")<CR>
-map <Plug>(acid-motion-op)    <Cmd>set opfunc=AcidMotion<CR>g@
-map <Plug>(acid-eval-symbol)  <Cmd>call AcidMotion("symbol")<CR>
-map <Plug>(acid-eval-visual)  <Cmd>call AcidMotion("visual")<CR>
-map <Plug>(acid-eval-expr)    <Cmd>lua require("acid.features").eval_expr()<CR>
-map <Plug>(acid-eval-print)   <Cmd>call AcidSendEval("eval_print")<CR>
+map <Plug>(acid-go-to)         <Cmd>lua require("acid.features").go_to()<CR>
+map <Plug>(acid-docs)          <Cmd>lua require("acid.features").docs()<CR>
+map <Plug>(acid-eval-cmdline)  <Cmd>call AcidSendEval("eval_cmdline")<CR>
+map <Plug>(acid-motion-op)     <Cmd>set opfunc=AcidMotion<CR>g@
+map <Plug>(acid-eval-symbol)   <Cmd>call AcidMotion("symbol")<CR>
+map <Plug>(acid-eval-visual)   <Cmd>call AcidMotion("visual")<CR>
+map <Plug>(acid-eval-top-expr) <Cmd>lua require("acid.features").eval_expr("top")<CR>
+map <Plug>(acid-eval-expr)     <Cmd>lua require("acid.features").eval_expr()<CR>
+map <Plug>(acid-eval-print)    <Cmd>call AcidSendEval("eval_print")<CR>
 
 map <Plug>(acid-virtualtext-clear-line) <Cmd>call luaeval("require('acid.middlewares.virtualtext').clear(_A)", line('.'))<CR>
 map <Plug>(acid-virtualtext-toggle)     <Cmd>call luaeval("require('acid.middlewares.virtualtext').toggle()", v:null)<CR>
@@ -110,6 +111,7 @@ if !g:acid_no_default_keymappings
     autocmd FileType clojure nmap <buffer> <silent> cp     <Plug>(acid-motion-op)
     autocmd FileType clojure vmap <buffer> <silent> cp     <Plug>(acid-eval-visual)
     autocmd FileType clojure nmap <buffer> <silent> cps    <Plug>(acid-eval-symbol)
+    autocmd FileType clojure nmap <buffer> <silent> cpt    <Plug>(acid-eval-top-expr)
     autocmd FileType clojure nmap <buffer> <silent> cpp    <Plug>(acid-eval-expr)
     autocmd FileType clojure nmap <buffer> <silent> cqp    <Plug>(acid-eval-print)