Fix issues (#40)

* #38: Add eval_print feature

* #38: Make 'print' return errors and exceptions as well

* #38: Substitute 'AcidInsertEval' for 'AcidSendEval'

So multiple handlers could be used for the same code+ns parameter combination

* #38: Add 'cqp' mapping for printing eval response

* Fix bug with finding path

* #38: fix ns not found

Author: hkupty

API.md

@@ -68,6 +68,15 @@ code **(string)**: Clojure s-expression to be evaluated on the nrepl
  Defaults to current file's ns.
 
 
+## `acid.features.eval_print(code[, ns])`
+Evaluate the given code and print the result.
+
+code **(string)**: Clojure s-expression to be evaluated on the nrepl
+
+*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.
 

lua/acid/features.lua

@@ -30,6 +30,16 @@ features.eval_cmdline = function(code, ns)
   ))
 end
 
+--- Evaluate the given code and print the result.
+-- @tparam string code Clojure s-expression to be evaluated on the nrepl
+-- @tparam[opt] string ns Namespace to be used when evaluating the code.
+-- Defaults to current file's ns.
+features.eval_print = function(code, ns)
+  acid.run(ops.eval{code = code, ns = ns}:with_handler(middlewares
+      .print{}
+  ))
+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.

lua/acid/middlewares/print.lua

@@ -10,6 +10,12 @@ do_print.middleware = function(config)
       if data.value ~= nil then
         vim.api.nvim_out_write(data.value .. "\n")
       end
+      if data.ex ~= nil then
+        vim.api.nvim_err_writeln(data.ex)
+      end
+      if data.err ~= nil then
+        vim.api.nvim_err_writeln(data.err)
+      end
 
       return middleware(data)
     end

plugin/acid.vim

@@ -32,15 +32,19 @@ function! AcidMotion(mode)
   exec 'lua require("acid.features").eval_expr("'.a:mode.'")'
 endfunction
 
-function! AcidInsertEval(...)
-  let ns = a:0 >= 1 ? a:1 : "user"
+function! AcidSendEval(handler)
+  let ns = AcidGetNs()
+  if ns == ""
+    let ns = "user"
+  endif
   call inputsave()
   let code = input(ns."=> ")
   call inputrestore()
-  call luaeval("require('acid.features').eval_cmdline(_A[1], _A[2])", [code, ns])
+  call luaeval("require('acid.features')." . a:handler ."(_A[1], _A[2])", [code, ns])
 endfunction
 
 
+
 augroup acid
   autocmd BufWritePost *.clj call s:require()
 
@@ -54,10 +58,11 @@ augroup acid
 
   au FileType clojure nmap <buffer> <silent> <C-]> <Cmd>lua require("acid.features").go_to()<CR>
   au FileType clojure nmap <buffer> <silent> K <Cmd>lua require("acid.features").docs()<CR>
-  au FileType clojure nmap <buffer> <silent> <C-c>x <Cmd>call AcidInsertEval()<CR>
-  au FileType clojure imap <buffer> <silent> <C-c>x <Cmd>call AcidInsertEval()<CR>
+  au FileType clojure nmap <buffer> <silent> <C-c>x <Cmd>call AcidSendEval("eval_cmdline")<CR>
+  au FileType clojure imap <buffer> <silent> <C-c>x <Cmd>call AcidSendEval("eval_cmdline")<CR>
   au FileType clojure map <buffer> <silent> cp <Cmd>set opfunc=AcidMotion<CR>g@
   au FileType clojure map <buffer> <silent> cpp <Cmd>lua require("acid.features").eval_expr()<CR>
+  au FileType clojure map <buffer> <silent> cqp <Cmd>call AcidSendEval("eval_print")<CR>
 
   au FileType clojure map <buffer> <silent> <C-c>ll <Cmd>call luaeval("require('acid.middlewares.virtualtext').clear(_A)", line('.'))<Cr>
   au FileType clojure map <buffer> <silent> <C-c>ln <Cmd>call luaeval("require('acid.middlewares.virtualtext').toggle()", v:null)<Cr>

rplugin/python3/acid/pure/__init__.py

@@ -41,7 +41,7 @@ def path_to_ns(path, stop_paths=None, base_files=None):
         path[-1] = path[-1].split('.')[0]
         for ix, _ in enumerate(path):
             for bf in base_files:
-                if os.path.exists(os.path.join(*["/", *path[:ix], bp])):
+                if os.path.exists(os.path.join(*["/", *path[:ix], bf])):
                     raw_path_list = path[ix+1:]
                     break