[clojure-emacs#209] fix modeline + better socket form support

Author: Mike Bruce

inf-clojure.el

@@ -358,12 +358,12 @@ mode.  Default is whitespace followed by 0 or 1 single-letter colon-keyword
 (defun inf-clojure--modeline-info ()
   "Return modeline info for `inf-clojure-minor-mode'.
 Either \"no process\" or \"buffer-name(repl-type)\""
-  (let ((inf-buffer (inf-clojure--get-buffer))))
-  (if (and (bufferp inf-buffer)
-           (buffer-live-p inf-buffer))
-      (with-current-buffer inf-buffer
-        (format "%s(%s)" (buffer-name (current-buffer)) inf-clojure-repl-type))
-    "no process"))
+  (let ((inf-buffer (inf-clojure--get-buffer)))
+    (if (and (bufferp inf-buffer)
+             (buffer-live-p inf-buffer))
+        (with-current-buffer inf-buffer
+          (format "%s(%s)" (buffer-name (current-buffer)) inf-clojure-repl-type))
+      "no process")))
 
 (defvar inf-clojure-mode-map
   (let ((map (make-sparse-keymap)))
@@ -867,10 +867,19 @@ HOST is the host the process is running on, PORT is where it's listening."
   (inf-clojure (cons host port)))
 
 (defvar-local inf-clojure-socket-callback nil
-  "Used to transfer state between the socket process and the inf-clojure-connect process/bufffer.")
+  "Used to transfer state between the socket process and the
+inf-clojure-connect process/buffer.")
 
 (defcustom inf-clojure-cli-args nil
-  "Arguments to be supplied when the clojure repl type is used e.g -Mdev.")
+  "Arguments to be supplied when the clojure repl type is used e.g -Mdev."
+  :type 'string
+  :safe #'stringp)
+
+(defcustom inf-clojure-cljs-cli-args "-m cljs.main"
+  "Arguments to be supplied when the cljs repl type is used e.g \"-Mdev:client -e (start-cljs)\"."
+  :type 'string
+  :safe #'stringp)
+
 
 (defun inf-clojure-socket-filter (process output)
   "A filter that gets triggered each time the socket receives new OUTPUT.
@@ -895,6 +904,25 @@ OUTPUT is the latest data received from the process"
 	  (when inf-clojure-socket-callback
 	    (funcall inf-clojure-socket-callback)))))))
 
+(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}\""))
+    (cljs . ,(concat
+             "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"))
+    (planck . "planck -n %s")
+    (babashka . "bb socket-repl %s")))
+
+
 ;;;###autoload
 (defun inf-clojure-socket (&optional &rest args)
   "Starts a socket REPL server and connects to it via `inf-clojure'.
@@ -916,7 +944,7 @@ VALUE must be a number specifying the port for the socket to listen.
 
 `:repl-type'
 
-VALUE must be a valid repl type, given as a string e.g clojure/cljs/lein/babashka.
+VALUE must be a valid repl type, given as a string e.g clojure/cljs/lein/babashka. Note that `joker' and `lumo' are not supported.
 
 `:project-name'
 
@@ -934,13 +962,14 @@ VALUE can be any string, by default this is either derived from your current dir
          (socket-buffer-name (format "*%s-%s-socket*" project-name repl-type))
          (socket-buffer (get-buffer-create socket-buffer-name))
          (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))))
          (sock (start-file-process-shell-command
                 socket-process-name socket-buffer
-                (concat "clojure"
-                        " -J-Dclojure.server.repl=\"{:port "
-                        (number-to-string port)
-                        " :accept clojure.core.server/repl}\" "
-                        inf-clojure-cli-args))))
+                socket-cmd)))
     (with-current-buffer socket-buffer
       (setq-local
        inf-clojure-socket-callback
@@ -952,7 +981,7 @@ VALUE can be any string, by default this is either derived from your current dir
                      repl-buffer-name)
          (inf-clojure-connect host port))))
     (set-process-filter sock #'inf-clojure-socket-filter)
-    (message "Starting socket server at %s:%s" host port)))
+    (message "Starting socket server at %s:%s with '%s'" host port socket-cmd)))
 
 
 (defun inf-clojure--forms-without-newlines (str)