hack for nREPL

Author: swannodette

src/main/clojure/cljs/repl/browser.clj

@@ -29,6 +29,10 @@
 (def ^:dynamic es nil)
 (def outs (ConcurrentHashMap.))
 
+(defn thread-name []
+  (let [name (.getName (Thread/currentThread))]
+    (if (string/starts-with? name "nrepl") "main" name)))
+
 (def ext->mime-type
   {".html" "text/html"
    ".css" "text/css"
@@ -73,7 +77,7 @@
     (set-return-value-fn return-value-fn)
     (server/send-and-close conn 200
       (json/write-str
-        {"repl" (.getName (Thread/currentThread))
+        {"repl" (thread-name)
          "form" form})
       "application/json")))
 
@@ -346,7 +350,7 @@
           (if launch-browser
             (maybe-browse-url base-url)
             (println (waiting-to-connect-message base-url)))))))
-  (.put outs (.getName (Thread/currentThread)) *out*)
+  (.put outs (thread-name) *out*)
   (swap! server-state update :listeners inc))
 
 (defrecord BrowserEnv []
@@ -362,7 +366,7 @@
   (-load [this provides url]
     (load-javascript this provides url))
   (-tear-down [this]
-    (.remove outs (.getName (Thread/currentThread)))
+    (.remove outs (thread-name))
     (let [server-state (:server-state this)]
       (when (zero? (:listeners (swap! server-state update :listeners dec)))
         (binding [server/state server-state] (server/stop))

src/main/clojure/cljs/repl/node.clj

@@ -29,7 +29,8 @@
 (def errs (ConcurrentHashMap.))
 
 (defn thread-name []
-  (.getName (Thread/currentThread)))
+  (let [name (.getName (Thread/currentThread))]
+    (if (string/starts-with? name "nrepl") "main" name)))
 
 (defn create-socket [^String host port]
   (let [socket (Socket. host (int port))
@@ -124,7 +125,7 @@
 (defn setup
   ([repl-env] (setup repl-env nil))
   ([{:keys [host port socket state] :as repl-env} opts]
-   (let [tname (.getName (Thread/currentThread))]
+   (let [tname (thread-name)]
      (.put results tname (LinkedBlockingQueue.))
      (.put outs tname *out*)
      (.put errs tname *err*))