Deduplicate inplace (#69)

Also, makes virtualtext always show at the end of the form

Author: hkupty

API.md

@@ -91,19 +91,12 @@ code **(string)**: Clojure s-expression to be evaluated on the nrepl
  Defaults to current file's ns.
 
 
-## `acid.features.eval_inplace([mode[, ns]])`
+## `acid.features.eval_expr([mode[, replace[, ns]]])`
 Evaluate the current form or the given motion.
 
 *mode* **(string)**: motion mode
 
-*ns* **(string)**: Namespace to be used when evaluating the code.
- Defaults to current file's ns.
-
-
-## `acid.features.eval_expr([mode[, ns]])`
-Evaluate the current form or the given motion.
-
-*mode* **(string)**: motion mode
+*replace* **(boolean)**: whether it should replace the form with its result
 
 *ns* **(string)**: Namespace to be used when evaluating the code.
  Defaults to current file's ns.

lua/acid/features.lua

@@ -60,12 +60,15 @@ features.eval_print = function(code, ns)
 end
 
 --- Evaluate the current form or the given motion.
--- The result will replace the current form
+-- The result will be shown on a virtualtext next to the current form
+-- and also stored on the clipboard.
 -- @tparam[opt] string mode motion mode
+-- @tparam[opt] boolean replace whether it should replace the form with its result
 -- @tparam[opt] string ns Namespace to be used when evaluating the code.
 -- Defaults to current file's ns.
-features.eval_inplace = function(mode, ns)
+features.eval_expr = function(mode, replace, ns)
   local payload = {}
+  local midlws
   local coord, form
   if mode == nil then
     form, coord = forms.form_under_cursor()
@@ -83,47 +86,27 @@ features.eval_inplace = function(mode, ns)
   if ns ~= nil or ns ~= "" then
     payload.ns = ns
   end
-  acid.run(ops.eval(payload):with_handler(middlewares
-      .refactor(utils.merge(coord, {accessor = function(dt)
-        if dt.value ~= nil then
-          return dt.value
-        else
-          return dt.out
-        end
-      end}))))
-end
 
---- Evaluate the current form or the given motion.
--- The result will be shown on a virtualtext next to the current form
--- and also stored on the clipboard.
--- @tparam[opt] string mode motion mode
--- @tparam[opt] string ns Namespace to be used when evaluating the code.
--- Defaults to current file's ns.
-features.eval_expr = function(mode, ns)
-  local payload = {}
-  if mode == nil then
-    local form = forms.form_under_cursor()
-    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")
+  if replace then
+    midlws = middlewares
+    .refactor(utils.merge(coord, {accessor = function(dt)
+      if dt.value ~= nil then
+        return dt.value
+      else
+        return dt.out
+      end
+    end}))
   else
-    local lines = forms.form_from_motion(mode)
-    payload.code = table.concat(lines, "\n")
-  end
-  ns = ns or vim.api.nvim_call_function("AcidGetNs", {})
-  if ns ~= nil or ns ~= "" then
-    payload.ns = ns
-  end
-  acid.run(ops.eval(payload):with_handler(middlewares
+    midlws = middlewares
       .print{}
       .clipboard{}
-      .virtualtext{}
-  ))
+      .virtualtext(coord)
+    end
+
+  acid.run(ops.eval(payload):with_handler(midlws))
 end
 
+
 --- Sends a `(require '[...])` function to the nrepl.
 -- Will send an `AcidRequired` autocommand after complete.
 -- @tparam[opt] string ns Namespace to be used when evaluating the code.

lua/acid/middlewares/virtualtext.lua

@@ -29,11 +29,11 @@ virtualtext.toggle = function()
 
 end
 
-virtualtext.middleware = function(_)
+virtualtext.middleware = function(config)
   return function(middleware)
     return function(data)
       local cb = vim.api.nvim_get_current_buf()
-      local ln = vim.api.nvim_call_function("line", {"."}) - 1
+      local ln = config.to[1] - 1
       local key = tostring(cb) .. "/" .. tostring(ln)
 
       if data.status then
@@ -58,13 +58,13 @@ virtualtext.middleware = function(_)
 
       if #vt > 0 then
         table.insert(vt, 1, {";; => ", "Comment"})
-
         table.insert(virtualtext.cache[key], vt)
 
         virtualtext.cache_index[key] = #virtualtext.cache[key]
 
         -- TODO split_lines
         vim.api.nvim_buf_set_virtual_text(cb, virtualtext.ns, ln, vt, {})
+
       end
       return middleware(data)
     end

plugin/acid.vim

@@ -60,11 +60,11 @@ function! AcidCleanNs()
 endfunction
 
 function! AcidMotion(mode)
-  exec 'lua require("acid.features").eval_expr("'.a:mode.'")'
+  exec 'lua require("acid.features").eval_expr("'.a:mode.'", false)'
 endfunction
 
 function! AcidEvalInplace(mode)
-  exec 'lua require("acid.features").eval_inplace("'.a:mode.'")'
+  exec 'lua require("acid.features").eval_expr("'.a:mode.'", true)'
 endfunction
 
 function! AcidSendEval(handler)
@@ -105,8 +105,8 @@ map <Plug>(acid-eval-print)       <Cmd>call AcidSendEval("eval_print")<CR>
 map <Plug>(acid-replace-op)       <Cmd>set opfunc=AcidEvalInplace<CR>g@
 map <Plug>(acid-replace-symbol)   <Cmd>call AcidEvalInplace("symbol")<CR>
 map <Plug>(acid-replace-visual)   <Cmd>call AcidEvalInplace("visual")<CR>
-map <Plug>(acid-replace-top-expr) <Cmd>lua require("acid.features").eval_inplace("top")<CR>
-map <Plug>(acid-replace-expr)     <Cmd>lua require("acid.features").eval_inplace()<CR>
+map <Plug>(acid-replace-top-expr) <Cmd>lua require("acid.features").eval_expr("top", true)<CR>
+map <Plug>(acid-replace-expr)     <Cmd>lua require("acid.features").eval_expr(nil, true)<CR>
 
 map <Plug>(acid-thread-first)     <Cmd>lua require("acid.features").thread_first()<CR>
 map <Plug>(acid-thread-last)      <Cmd>lua require("acid.features").thread_last()<CR>