Add basic NREPL support (for fun)

Author: jebberjeb

plugin/socketrepl.vim

@@ -15,24 +15,25 @@ function! StartIfNotRunning()
 endfunction
 command! Start call StartIfNotRunning()
 
-function! Connect(host_colon_port)
+function! Connect(host_colon_port, op_code)
     if a:host_colon_port == ""
         let conn = "localhost:5555"
     else
         let conn = a:host_colon_port
     endif
-    let res = rpcnotify(g:nvim_tcp_plugin_channel, 'connect', conn)
+    let res = rpcnotify(g:nvim_tcp_plugin_channel, a:op_code, conn)
     return res
 endfunction
 
-function! ReadyConnect(host_colon_port)
+function! ReadyConnect(host_colon_port, op_code)
     if g:socket_repl_plugin_ready == 1
-        call Connect(a:host_colon_port)
+        call Connect(a:host_colon_port, a:op_code)
     else
         echo s:not_ready
     endif
 endfunction
-command! -nargs=? Connect call ReadyConnect("<args>")
+command! -nargs=? Connect call ReadyConnect("<args>", "connect")
+command! -nargs=? NConnect call ReadyConnect("<args>", "connect-nrepl")
 
 function! EvalBuffer()
     ReplLog

plugin/socketrepl.vim.debug

@@ -1,15 +1,17 @@
 let g:nvim_tcp_plugin_channel = 0
+let g:manually_start_socket_repl_plugin = 1
 
-function! Connect(host_colon_port)
+function! Connect(host_colon_port, op_code)
     if a:host_colon_port == ""
         let conn = "localhost:5555"
     else
         let conn = a:host_colon_port
     endif
-    let res = rpcrequest(g:nvim_tcp_plugin_channel, 'connect', conn)
+    let res = rpcrequest(g:nvim_tcp_plugin_channel, a:op_code, conn)
     return res
 endfunction
-command! -nargs=? Connect call Connect("<args>")
+command! -nargs=? Connect call Connect("<args>", "connect")
+command! -nargs=? NConnect call Connect("<args>", "connect-nrepl")
 
 function! EvalBuffer()
     ReplLog

project.clj

@@ -6,6 +6,7 @@
   :dependencies [[org.clojure/clojure "1.9.0-alpha12"]
                  [org.clojure/tools.logging "0.3.1"]
                  [org.clojure/tools.namespace "0.2.11"]
+                 [org.clojure/tools.nrepl "0.2.12"]
                  [log4j/log4j "1.2.17" :exclusions [javax.mail/mail
                                                     javax.jms/jms
                                                     com.sun.jmdk/jmxtools

socket-repl-plugin-0.1.0-SNAPSHOT-standalone.jar

@@ -0,0 +1,74 @@
+(ns socket-repl.nrepl
+  "Provides a channel interface to nrepl input and output."
+  (:require
+    [clojure.java.io :as io]
+    [clojure.core.async :as async]
+    [clojure.tools.nrepl :as nrepl]
+    [socket-repl.util :refer [log-start log-stop]]))
+
+(defn subscribe-output
+  "Pipes the nrepl output to `chan`"
+  [{:keys [output-channel]} chan]
+  (async/pipe output-channel chan))
+
+(defn connect
+  "Create a connection to a nrepl."
+  [{:keys [connection]} host port]
+  (let [port (Integer/parseInt port)]
+    (reset! connection {:host host
+                        :port port
+                        :connection (nrepl/connect :port port)})))
+
+(defn output-channel
+  [nrepl]
+  (:output-channel nrepl))
+
+(defn input-channel
+  [nrepl]
+  (:input-channel nrepl))
+
+(defn client
+  [nrepl]
+  (-> nrepl
+      :connection
+      deref
+      :connection
+      (nrepl/client 1000)))
+
+(defn connected?
+  [{:keys [connection]}]
+  (:host @connection))
+
+(defn start
+  [{:keys [input-channel output-channel] :as nrepl}]
+  (log-start
+    "nrepl"
+    (async/thread
+      (loop []
+        (when-let [input (async/<!! input-channel)]
+          (when (connected? nrepl)
+            (async/onto-chan
+              output-channel
+              (nrepl/response-values
+                (nrepl/message (client nrepl)
+                               {:op "eval" :code (pr-str input)}))
+              false))
+          (recur))))
+    nrepl))
+
+(defn stop
+  [{:keys [connection output-channel input-channel] :as nrepl}]
+  (log-stop
+    "nrepl"
+    (.close (:connection @connection))
+    (async/close! output-channel)
+    (async/close! input-channel)
+    nrepl))
+
+(defn new
+  []
+  {:input-channel (async/chan 1024)
+   :output-channel (async/chan 1024)
+   :connection (atom {:host nil
+                      :port nil
+                      :connection nil})})

src/socket_repl/nrepl.clj

@@ -2,6 +2,7 @@
   "Writes (presumably socket output) to the repl log."
   (:require
     [clojure.core.async :as async]
+    [socket-repl.nrepl :as nrepl]
     [socket-repl.socket-repl :as socket-repl]
     [socket-repl.util :refer [log-start log-stop]])
   (:import
@@ -18,13 +19,16 @@
   (:input-channel repl-log))
 
 (defn start
-  [{:keys [file input-channel socket-repl] :as repl-log}]
+  [{:keys [file input-channel socket-repl nrepl] :as repl-log}]
 
   (log-start
     "repl-log"
     ;; Subscribe to socket-repl output.
     (socket-repl/subscribe-output socket-repl input-channel)
 
+    ;; Subscribe to nrepl output.
+    (nrepl/subscribe-output nrepl input-channel)
+
     ;; Write input to file.
     (let [print-stream (PrintStream. file)]
       (async/thread
@@ -44,8 +48,9 @@
     (dissoc repl-log :print-stream :input-channel)))
 
 (defn new
-  [socket-repl]
+  [socket-repl nrepl]
   {:socket-repl socket-repl
+   :nrepl nrepl
    :file (File/createTempFile "socket-repl" ".txt")
    :print-stream nil
    :input-channel (async/chan 1024)})

src/socket_repl/repl_log.clj

@@ -8,6 +8,7 @@
     [clojure.tools.logging :as log]
     [neovim-client.message :as message]
     [neovim-client.nvim :as nvim]
+    [socket-repl.nrepl :as nrepl]
     [socket-repl.repl-log :as repl-log]
     [socket-repl.socket-repl :as socket-repl]
     [socket-repl.util :refer [log-start log-stop]]))
@@ -43,9 +44,10 @@
                   \n"######################\n")))
 
 (defn run-command
-  [{:keys [nvim socket-repl]} f]
+  [{:keys [nvim nrepl socket-repl]} f]
   (fn [msg]
-    (if-not (socket-repl/connected? socket-repl)
+    (if-not (or (socket-repl/connected? socket-repl)
+                (nrepl/connected? nrepl))
       (async/thread
         (nvim/vim-command
           nvim ":echo 'Use :Connect host:port to connect to a socket repl'"))
@@ -77,14 +79,15 @@
   (:code-channel plugin))
 
 (defn start
-  [{:keys [nvim repl-log socket-repl code-channel] :as plugin}]
+  [{:keys [nvim nrepl repl-log socket-repl code-channel] :as plugin}]
 
   ;; Wire sub-component io.
   (log-start
     "plugin"
     (let [mult (async/mult code-channel)]
       (async/tap mult (socket-repl/input-channel socket-repl))
-      (async/tap mult (repl-log/input-channel repl-log)))
+      (async/tap mult (repl-log/input-channel repl-log))
+      (async/tap mult (nrepl/input-channel nrepl)))
 
     ;; Setup plugin functions.
     (nvim/register-method!
@@ -104,6 +107,24 @@
                               ":echo 'Unable to connect to socket repl.'"))))
           :done)))
 
+    (nvim/register-method!
+      nvim
+      "connect-nrepl"
+      (fn [msg]
+        ;; TODO - reuse this
+        (let [[host port] (-> msg
+                              message/params
+                              first
+                              (string/split #":"))]
+          (try
+            (nrepl/connect nrepl host port)
+            (catch Throwable t
+              (log/error t "Error connecting to nrepl")
+              (async/thread (nvim/vim-command
+                              nvim
+                              ":echo 'Unable to connect to nrepl.'"))))
+          :done)))
+
     (nvim/register-method!
       nvim
       "eval-code"
@@ -196,8 +217,9 @@
     plugin))
 
 (defn new
-  [nvim repl-log socket-repl]
+  [nvim nrepl repl-log socket-repl]
   {:nvim nvim
+   :nrepl nrepl
    :repl-log repl-log
    :socket-repl socket-repl
    :code-channel (async/chan 1024)})

src/socket_repl/socket_repl_plugin.clj

@@ -6,17 +6,20 @@
     [neovim-client.nvim :as nvim]
     [socket-repl.socket-repl-plugin :as plugin]
     [socket-repl.repl-log :as repl-log]
-    [socket-repl.socket-repl :as socket-repl])
+    [socket-repl.socket-repl :as socket-repl]
+    [socket-repl.nrepl :as nrepl])
   (:gen-class))
 
 (defn new-system*
   [nvim]
   (let [socket-repl (socket-repl/start (socket-repl/new))
-        repl-log (repl-log/start (repl-log/new socket-repl))
-        plugin (plugin/start (plugin/new nvim repl-log socket-repl))]
+        nrepl (nrepl/start (nrepl/new))
+        repl-log (repl-log/start (repl-log/new socket-repl nrepl))
+        plugin (plugin/start (plugin/new nvim nrepl repl-log socket-repl))]
     {:nvim nvim
      :repl-log repl-log
      :socket-repl socket-repl
+     :nrepl nrepl
      :plugin plugin}))
 
 (defn new-system