Small fixes & merge leftover cleanups (#76)

* Make indirection layer smaller

* Cleanup previously re-introduced duplicated fn

* Force redraw for virtualtext

Author: hkupty

lua/acid/core.lua

@@ -8,7 +8,7 @@ local utils = require("acid.utils")
 local log = require("acid.log")
 
 local core = {
-  indirection = setmetatable({}, utils.LRU(10))
+  indirection = setmetatable({}, utils.LRU(5))
 }
 
 --- Forward messages to the nrepl and registers the handler.

lua/acid/features.lua

@@ -59,40 +59,6 @@ features.eval_print = function(code, ns)
   ))
 end
 
---- Evaluate the current form or the given motion.
--- The result will replace the current form
--- @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_inplace = function(mode, ns)
-  local payload = {}
-  local coord, form
-  if mode == nil then
-    form, coord = forms.form_under_cursor()
-    payload.code = table.concat(form, "\n")
-  elseif mode == "symbol" then
-    payload.code, coord = forms.symbol_under_cursor()
-  elseif mode == "top" then
-    form, coord = forms.form_under_cursor(true)
-    payload.code = table.concat(form, "\n")
-  else
-    lines, coord = 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
-      .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.
@@ -132,6 +98,10 @@ features.eval_expr = function(mode, replace, ns)
     end}))
   else
     midlws = middlewares
+      .print{}
+      .clipboard{}
+      .virtualtext(coord)
+  end
 
       .print{}
       .clipboard{}

lua/acid/init.lua

@@ -54,7 +54,7 @@ end
 --- Setup admin nrepl session
 -- This nrepl session should be used by plugins to deal with clojure code
 -- without injecting things in the user nrepl session
--- or for things that clojure could deal with better while not having a 
+-- or for things that clojure could deal with better while not having a
 -- nrepl session to use.
 acid.admin_session_start = function()
   if admin_session_path == nil then

lua/acid/middlewares/virtualtext.lua

@@ -25,6 +25,7 @@ virtualtext.toggle = function()
   end
 
   vim.api.nvim_buf_set_virtual_text(cb, virtualtext.ns, ln, possible_vts[current_ix], {})
+  vim.api.nvim__buf_redraw_range(cb, ln, ln)
   virtualtext.cache_index[key] = current_ix
 
 end
@@ -66,6 +67,7 @@ virtualtext.middleware = function(config)
 
         -- TODO split_lines
         vim.api.nvim_buf_set_virtual_text(cb, virtualtext.ns, ln, vt, {})
+        vim.api.nvim__buf_redraw_range(cb, ln, ln)
 
       end
       return middleware(data)

plugin/acid.vim

@@ -67,10 +67,6 @@ function! AcidEvalInplace(mode)
   exec 'lua require("acid.features").eval_expr("'.a:mode.'", true)'
 endfunction
 
-function! AcidEvalInplace(mode)
-  exec 'lua require("acid.features").eval_inplace("'.a:mode.'")'
-endfunction
-
 function! AcidSendEval(handler)
   let ns = AcidGetNs()
   if ns == ""