Add Eval command

The Eval command in this implements a version of the quasi-REPL of
vim-fireplace.

I chose to rename EvalCode to EvalForm in the process, because I needed
a naming scheme that supports Eval as the "base" case, and EvalCode
sounds too much like something taking user input. EvalForm on the other
hand feels more natural for the functionality it provides; send form
under cursor to be evaluated.

Author: mdiin

plugin/socketrepl.vim

@@ -50,20 +50,38 @@ function! ReadyEvalBuffer()
 endfunction
 command! EvalBuffer call ReadyEvalBuffer()
 
-function! EvalCode()
+function! EvalForm()
   ReplLog
-  let res = rpcnotify(g:nvim_tcp_plugin_channel, 'eval-code', [])
+  let res = rpcnotify(g:nvim_tcp_plugin_channel, 'eval-form', [])
   return res
 endfunction
 
-function! ReadyEvalCode()
+function! ReadyEvalForm()
   if g:socket_repl_plugin_ready == 1
-    call EvalCode()
+    call EvalForm()
   else
     echo s:not_ready
   endif
 endfunction
-command! EvalCode call ReadyEvalCode()
+command! EvalForm call ReadyEvalForm()
+
+function! Eval()
+  ReplLog
+  call inputsave()
+  let form = input('=> ')
+  call inputrestore()
+  let res = rpcnotify(g:nvim_tcp_plugin_channel, 'eval', [form])
+  return res
+endfunction
+
+function! ReadyEval()
+  if g:socket_repl_plugin_ready == 1
+    call Eval()
+  else
+    echo s:not_ready
+  endif
+endfunction
+command! Eval call ReadyEval()
 
 function! ReplLog(buffer_cmd)
   let res = rpcnotify(g:nvim_tcp_plugin_channel, 'show-log', a:buffer_cmd)
@@ -109,8 +127,9 @@ endfunction
 command! Doc call ReadyDoc()
 
 if !exists('g:disable_socket_repl_mappings')
+  nnoremap <leader>e :Eval<cr>
   nnoremap <leader>eb :EvalBuffer<cr>
-  nnoremap <leader>ef :EvalCode<cr>
+  nnoremap <leader>ef :EvalForm<cr>
   nnoremap <leader>doc :Doc<cr>
   nnoremap <leader>rlog :ReplLog<cr>
   nnoremap <leader>drlog :DismissReplLog<cr>

src/socket_repl/socket_repl_plugin.clj

@@ -25,7 +25,7 @@
              (str "\n##### PLUGIN ERR #####\n"
                   (.getMessage throwable) "\n"
                   (string/join "\n" (map str (.getStackTrace throwable)))
-                  \n"######################\n")))
+                  "\n######################\n")))
 
 (defn run-command
   [{:keys [nvim nrepl socket-repl]} f]
@@ -111,7 +111,23 @@
 
     (nvim/register-method!
       nvim
-      "eval-code"
+      "eval"
+      (run-command
+        plugin
+        (fn [msg]
+          (try
+            (async/>!! code-channel (parser/read-next
+                                      (-> msg
+                                          message/params
+                                          ffirst)
+                                      0 0))
+            (catch Throwable t
+              (log/error t "Error evaluating form")
+              (write-error repl-log t))))))
+
+    (nvim/register-method!
+      nvim
+      "eval-form"
       (run-command
         plugin
         (fn [msg]