WIP - log socket repl to file

Author: jebberjeb

socket-repl-plugin/TODO

@@ -3,14 +3,13 @@ TODO
 	[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
-		append it all to a file
-		preferably a temp file (could be a lot of data)
-		don't keep it in memory
-		`:ShowRepl`
+		[X] append it all to a file
+		[X] preferably a temp file (could be a lot of data)
+		[_] `:ShowRepl`
 			no vimscript, invoke a plugin function
 			show the contents of the temp file in the current buffer
 			make it autoread
-	[_] Name vim functions correctly
+	[X] Name vim functions correctly
 	[_] Pass host, port in connect
 	[_] Shut down the plugin if no input received for one minute
 

socket-repl-plugin/plugin/socketrepl.vim

@@ -18,17 +18,20 @@ function! Connect()
     let res = rpcrequest(1, 'connect', [])
     return res
 endfunction
+command! Connect call Connect()
 
 function! EvalBuffer()
     "call StartIfNotRunning()
     let res = rpcrequest(1, 'eval-buffer', [])
     return res
 endfunction
+command! EvalBuffer call EvalBuffer()
 
 function! EvalCode()
     "call StartIfNotRunning()
     let res = rpcrequest(g:channel, 'eval-code', [])
     return res
 endfunction
+command! EvalCode call EvalCode()
 
 echo 'socket repl plugin loaded!'

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

@@ -7,10 +7,14 @@
     [neovim-client.nvim :as nvim])
   (:import
     (java.net Socket)
-    (java.io PrintStream)))
+    (java.io PrintStream File)))
 
 (def current-connection (atom nil))
 
+(defn output-file
+  []
+  (File/createTempFile "socket-repl" ".txt"))
+
 (defn connection
   "Create a connection to a socket repl."
   [host port]
@@ -28,6 +32,22 @@
   (.println out code-string)
   (.flush out))
 
+(defn write-code!
+  "Like `write-code`, but uses the current socket repl connection."
+  [code-string]
+  (write-code @current-connection code-string))
+
+(defn write-output
+  "Write a string to the output file."
+  [{:keys [:file]} string]
+  (.print file string)
+  (.flush file))
+
+(defn write-output!
+  "Like `write-output`, but uses the current socket repl connection."
+  [string]
+  (write-output @current-connection string))
+
 (defn connect!
   "Connect to a socket repl. Adds the connection to the `current-connection`
   atom. Creates `go-loop`s to delegate input from the socket to `handler` one
@@ -37,13 +57,15 @@
   [host port handler]
   (let [conn (connection host port)
         chan (async/chan 10)]
-    (reset! current-connection (assoc conn
-                                      :handler handler
-                                      :chan chan))
+    (reset! current-connection
+            (assoc conn
+                   :handler handler
+                   :chan chan
+                   :file (PrintStream. (output-file))))
 
     ;; input producer
     (go-loop []
-             (when-let [line (.readLine (:in conn))]
+             (when-let [line (str (.readLine (:in conn)) "\n")]
                (>! chan line)
                (recur)))
 
@@ -54,11 +76,6 @@
                (recur))))
   "success")
 
-(defn write-code!
-  "Like `write-code`, but uses the current socket repl connection."
-  [code-string]
-  (write-code @current-connection code-string))
-
 (defn -main
   [& args]
   ;; TODO: remove params for STDIO
@@ -71,8 +88,7 @@
       (connect! "localhost" "5555"
                 (fn [x]
                   (nvim/run-command-async!
-                    ;; TODO: Actually, append to a buffer?
-                    (format ":echo '%s'" (pr-str x))
+                    (write-output! x)
                     (fn [_] nil))))))
 
    (nvim/register-method!
@@ -85,10 +101,8 @@
      "eval-buffer"
      (fn [msg]
        (nvim/get-current-buffer-text-async
-         (fn [[x & _]]
-           ;; TODO: send code being executed
-           ;; back to vim, to show what actually
-           ;; happened in the repl buffer
+         (fn [x]
+           (write-output! (str x "\n"))
            (write-code! x)))))
 
   ;; TODO: Rather than an arbitrary timeout, the plugin should shut down

src/neovim_client/nvim.clj

@@ -82,6 +82,7 @@
     (buffer-get-line-async buffer n #(buffer-set-line-async! buffer n
                                                              (update-fn %)))))
 
+ ;; TODO: Do this with `get-buffer-line-slice`
 (defn buffer-get-text
   "Get the buffer's text as a single string."
   [buffer]
@@ -93,7 +94,8 @@
   "Convenience function to get the current buffer's text asynchronously."
   [f]
   (get-current-buffer-async
-    (fn [buffer] (buffer-get-lines-async buffer 0 -1 f))))
+    (fn [buffer] (buffer-get-lines-async
+                   buffer 0 -1 (fn [lines] (f (str/join "\n" lines)))))))
 
 ;; TODO - make it wipe out text in the buffer after the last line of new text.
 (defn buffer-set-text!