[clojure-emacs#209] close socket buffer when REPL buffer closed

The user gets asked if they want to close each buffer sequentially.
Or whatever their process-kill-query-function dictates.

Author: Mike Bruce

inf-clojure.el

@@ -870,6 +870,9 @@ HOST is the host the process is running on, PORT is where it's listening."
   "Used to transfer state between the socket process and the
 inf-clojure-connect process/buffer.")
 
+(defvar-local inf-clojure-socket-buffer nil
+  "Used to kill the socket buffer for a Clojure REPL with the REPL buffer is shutdown.")
+
 (defcustom inf-clojure-cli-args nil
   "Arguments to be supplied when the clojure repl type is used e.g -Mdev."
   :type 'string
@@ -904,21 +907,29 @@ OUTPUT is the latest data received from the process"
 	  (when inf-clojure-socket-callback
 	    (funcall inf-clojure-socket-callback)))))))
 
+(defun inf-clojure-repl-sentinel (process event)
+  "This function is called on update change, it is mainly used to ensure the socket a REPL was connected to is cleaned up when the REPL buffer is closed."
+  (when (not (process-live-p process))
+    (let ((repl-buffer (process-buffer process)))
+      (with-current-buffer repl-buffer
+        (when inf-clojure-socket-buffer
+          (kill-buffer inf-clojure-socket-buffer))))))
+
 (defvar inf-clojure-socket-forms
   `((lein . (concat "JVM_OPTS='-Dclojure.server.repl="
                     "{:port %s :accept clojure.core.server/repl}' lein repl"))
     (boot . (concat "export BOOT_JVM_OPTIONS='-Dclojure.server.repl="
                     "\"{:port %s :accept clojure.core.server/repl}\"' boot repl"))
     (clojure . ,(concat
-                "clojure"
-                " -J-Dclojure.server.repl="
-                "\"{:port %s :accept clojure.core.server/repl}\""))
+                 "clojure"
+                 " -J-Dclojure.server.repl="
+                 "\"{:port %s :accept clojure.core.server/repl}\""))
     (cljs . ,(concat
-             "clojure"
-             " -J-Dclojure.server.repl="
-             "\"{:port %s :accept clojure.core.server/repl}\""))
+              "clojure"
+              " -J-Dclojure.server.repl="
+              "\"{:port %s :accept clojure.core.server/repl}\""))
     (lein-clr . ,(concat "JVM_OPTS='-Dclojure.server.repl="
-                        "{:port %s :accept clojure.core.server/repl}' lein clr repl"))
+                         "{:port %s :accept clojure.core.server/repl}' lein clr repl"))
     (planck . "planck -n %s")
     (babashka . "bb socket-repl %s")))
 
@@ -964,22 +975,29 @@ VALUE can be any string, by default this is either derived from your current dir
          (repl-buffer-name (format "%s-%s-repl" project-name repl-type))
          (socket-form (cdr (assoc (intern repl-type) inf-clojure-socket-forms)))
          (socket-cmd (concat (format socket-form (number-to-string port))
-                        (cond ((string= repl-type "clojure") inf-clojure-cli-args)
-                              ((string= repl-type "cljs") inf-clojure-cljs-cli-args)
-                              (t nil))))
+                             (cond ((string= repl-type "clojure") inf-clojure-cli-args)
+                                   ((string= repl-type "cljs") inf-clojure-cljs-cli-args)
+                                   (t nil))))
          (sock (start-file-process-shell-command
                 socket-process-name socket-buffer
                 socket-cmd)))
     (with-current-buffer socket-buffer
       (setq-local
        inf-clojure-socket-callback
        (lambda ()
-         (setq-local inf-clojure-custom-repl-type
-                     (intern repl-type)
-                     inf-clojure-custom-repl-name
-                     ;; comint mode includes the ** chars
-                     repl-buffer-name)
-         (inf-clojure-connect host port))))
+         (setq inf-clojure-custom-repl-type
+               (intern repl-type)
+               inf-clojure-custom-repl-name
+               ;; comint mode includes the ** chars
+               repl-buffer-name
+               repl-buffer
+               (get-buffer-create repl-buffer-name))
+         (inf-clojure-connect host port)
+         (with-current-buffer (concat "*" repl-buffer-name "*")
+           (setq inf-clojure-socket-buffer socket-buffer))
+         (set-process-sentinel
+          (get-buffer-process (get-buffer (concat "*" repl-buffer-name "*")))
+          #'inf-clojure-repl-sentinel))))
     (set-process-filter sock #'inf-clojure-socket-filter)
     (message "Starting socket server at %s:%s with '%s'" host port socket-cmd)))