Couple the lifetime of launchpad and the clojure process

Author: plexus

CHANGELOG.md

@@ -1,10 +1,9 @@
 # Unreleased
 
-## Added
-
 ## Fixed
 
-## Changed
+- Couple the lifetime of the Clojure process to the lifetime of launchpad, exit
+  launchpad when the process dies, and kill the process when launchpad exits
 
 # 0.8.46-alpha (2022-10-07 / 4c68918)
 
@@ -69,4 +68,4 @@ Initial release
 - lambdaisland.classpath integration
 - Support for cider-nrepl, refactor-nrepl
 - Basic support for shadow-cljs cljs nREPL-base REPL
-- Auto-connect for Emacs
+- Auto-connect for Emacs

src/lambdaisland/launchpad.clj

@@ -318,8 +318,6 @@
   (let [args (clojure-cli-args ctx)]
     (apply debug (map shellquote args))
     (let [process (process args {:env env :out :inherit :err :inherit})]
-      (future
-        (System/exit (.waitFor process)))
       (assoc ctx :clojure-process process))))
 
 (defn maybe-connect-emacs [{:keys [options nrepl-port project-root] :as ctx}]
@@ -397,12 +395,15 @@
      :or {steps default-steps
           project-root (find-project-root)}}]
 
-   (reduce #(%2 %1)
-           {:main-opts *command-line-args*
-            :executable (or executable
-                            (str/replace *file*
-                                         (str project-root "/")
-                                         ""))
-            :project-root project-root}
-           steps)
-   @(promise)))
+   (let [ctx (reduce #(%2 %1)
+                     {:main-opts *command-line-args*
+                      :executable (or executable
+                                      (str/replace *file*
+                                                   (str project-root "/")
+                                                   ""))
+                      :project-root project-root}
+                     steps)
+         process (:clojure-process ctx)]
+     (.addShutdownHook (Runtime/getRuntime)
+                       (Thread. (fn [] (.destroy (:proc process)))))
+     (System/exit (:exit @process)))))