Added eval form under cursor

Author: jebberjeb

socket-repl-plugin/TODO

@@ -2,16 +2,21 @@ TODO
 	[X] Move all of the socket repl stuff to a plugin project
 	[X] Make buffer-get-text-async work, just test it at the repl
 	[X] Get "eval-code" working
-	[_] Figure out how to accumulate / display results in vim
+	[X] Figure out how to accumulate / display results in vim
 		[X] append it all to a file
 		[X] preferably a temp file (could be a lot of data)
-		[_] `:ShowRepl`
+		[X] `:ShowRepl`
 			no vimscript, invoke a plugin function
 			show the contents of the temp file in the current buffer
 			make it autoread
 	[X] Name vim functions correctly
+	[_] Rather than explicit repl output logging, can we intercept
+		channel
+		stream implementation
+	[_] tmux dev env script
 	[_] Pass host, port in connect
 	[_] Shut down the plugin if no input received for one minute
+	[X] evaluate form under cursor
 
 Goals
 	-Not a proper nRepl plugin, primary use is as an thought exercise
@@ -32,6 +37,8 @@ Goals
 		Forces you to explicity connect
 		One connection only `:call ConnectClojurePlugin(host, port)`
 		Accessible from vim buffer `:call ShowClojurePluginRepl()`
+	-Not a way of life
+		Does not include paredit, syntax highlight, etc
 
 Questions
 	Figwheel cljs-repl support

socket-repl-plugin/plugin/socketrepl.vim

@@ -29,7 +29,8 @@ command! EvalBuffer call EvalBuffer()
 
 function! EvalCode()
     "call StartIfNotRunning()
-    let res = rpcrequest(g:channel, 'eval-code', [])
+    "let res = rpcrequest(g:channel, 'eval-code', [])
+    let res = rpcrequest(1, 'eval-code', [])
     return res
 endfunction
 command! EvalCode call EvalCode()

socket-repl-plugin/src/socket_repl/socket_repl_plugin.clj

@@ -4,13 +4,35 @@
   (:require
     [clojure.java.io :as io]
     [clojure.core.async :as async :refer [go go-loop >! <!]]
+    [clojure.string :as string]
     [neovim-client.nvim :as nvim])
   (:import
     (java.net Socket)
     (java.io PrintStream File)))
 
 (def current-connection (atom nil))
 
+(defn position
+  "Find the position in a code string given line and column."
+  [code-str [y x]]
+  (->> code-str
+       string/split-lines
+       (take (dec y))
+       (string/join "\n")
+       count
+       (+ (inc x))))
+
+(defn get-form-at
+  "Returns the enclosing form from a string a code using [row col]
+  coordinates."
+  [code-str coords]
+  (let [pos (position code-str coords)]
+    (read-string
+      ;; Start at the last index of paren on or before `pos`, read a form.
+      (subs code-str (if (= \( (.charAt code-str pos))
+                       pos
+                       (.lastIndexOf (subs code-str 0 pos) "("))))))
+
 (defn output-file
   []
   (File/createTempFile "socket-repl" ".txt"))
@@ -96,8 +118,21 @@
    (nvim/register-method!
      "eval-code"
      (fn [msg]
-       ;; TODO: Get the cursor location, find current form
-       ))
+       (nvim/get-cursor-location-async
+         (fn [coords]
+           (nvim/get-current-buffer-text-async
+             (fn [x]
+               (try
+                 (let [form (get-form-at x coords)]
+                   (write-output! (str form "\n"))
+                   (write-code! form))
+                 (catch Throwable t
+                   ;; TODO: Use more general plugin-level ereror handling
+                   (write-output!
+                     (str "\n##### PLUGIN ERR #####\n"
+                          (.getMessage t) "\n"
+                          (string/join "\n" (map str (.getStackTrace t)))
+                          \n"######################\n"))))))))))
 
    (nvim/register-method!
      "eval-buffer"
@@ -138,4 +173,3 @@
     ;; Let nvim know we're shutting down.
     (nvim/run-command! ":let g:is_running=0")
     (nvim/run-command! ":echo 'plugin stopping.'")))
-

src/neovim_client/nvim.clj

@@ -22,13 +22,34 @@
 
 (defn get-api-info [] (send-message! "vim_get_api_info"))
 
+;; ***** Cursor *****
+
+(declare get-current-window-async)
+(defn get-cursor-location-async
+  "Gets the cursor's current position as a tuple (row, col) asynchronously."
+  [f]
+  (get-current-window-async
+    (fn [window]
+      (rpc/send-message-async!
+        (->request-msg "window_get_cursor" [window]) f))))
+
+;; ***** Lines *****
+
 (defn get-current-line [] (send-message! "vim_get_current_line"))
 
 (defn set-current-line!  [line] (send-message! "vim_set_current_line" line))
 
+;; ***** Windows *****
+
+(defn get-current-window-async
+  "Gets a reference to the current window asynchronously."
+  [f]
+  (rpc/send-message-async! (->request-msg "vim_get_current_window" []) f))
+
+;; ***** Buffers *****
+
 (defn get-current-buffer
-  ;; TODO: fix comment
-  "Returns ??? (object, map, ?) representing the current buffer."
+  "Returns a reference to the current buffer."
   []
   (send-message! "vim_get_current_buffer"))