[#209] implement PR feedback

More simplification, more consistent naming conventions and also
cleaning up bugs.

Author: Mike Bruce

README.md

@@ -117,7 +117,7 @@ common startup forms. You can select one of these or type in your own
 custom startup. This will start a REPL process for the current project
 and you can start interacting with it.
 
-If you want to use a socket REPL server, use `M-x inf-clojure-socket`
+If you want to use a socket REPL server, use `M-x inf-clojure-socket-repl`
 which will start a socket server and connect to it for you.
 
 If you've already started a socket REPL server, use `M-x inf-clojure-connect`

inf-clojure.el

@@ -74,7 +74,7 @@
 (defvar inf-clojure-startup-forms '((lein . "lein repl")
                                     (boot . "boot repl")
                                     (clojure . "clojure")
-                                    (cljs . "clojure -m cljs.main -r")
+                                    (cljs . "clojure -M -m cljs.main -r")
                                     (lein-clr . "lein clr repl")
                                     (planck . "planck -d")
                                     (babashka . "bb")
@@ -176,9 +176,6 @@
 Its root binding is nil and it can be further customized using
 either `setq-local` or an entry in `.dir-locals.el`." )
 
-(defvar-local inf-clojure-repl-name nil
-  "When creating a REPL, set the name to be given to the buffer it's output is sent to.")
-
 (defvar inf-clojure-buffer nil
   "The current `inf-clojure' process buffer.
 
@@ -816,18 +813,19 @@ process buffer for a list of commands.)"
                                    (format "inf-clojure %s" (inf-clojure--project-name project-dir))
                                  "inf-clojure")))
          ;; comint adds the asterisks to both sides
-         (repl-buffer-name (format "*%s*" process-buffer-name))
-         (repl-type (or (unless prefix-arg
-                          inf-clojure-custom-repl-type)
-                        (car (rassoc cmd inf-clojure-startup-forms))
-                        (inf-clojure--prompt-repl-type))))
+         (repl-buffer-name (format "*%s*" process-buffer-name)))
     ;; Create a new comint buffer if needed
     (unless (comint-check-proc repl-buffer-name)
       ;; run the new process in the project's root when in a project folder
       (let ((default-directory (or project-dir default-directory))
             (cmdlist (if (consp cmd)
                          (list cmd)
-                       (split-string-and-unquote cmd))))
+                       (split-string-and-unquote cmd)))
+            (repl-type (or inf-clojure-socket-repl-type
+                           (unless prefix-arg
+                             inf-clojure-custom-repl-type)
+                        (car (rassoc cmd inf-clojure-startup-forms))
+                        (inf-clojure--prompt-repl-type))))
         (message "Starting Clojure REPL via `%s'..." cmd)
         (with-current-buffer (apply #'make-comint
                                     process-buffer-name (car cmdlist) nil (cdr cmdlist))
@@ -879,93 +877,68 @@ OUTPUT is the latest data received from the process"
 	    (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."
+  "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}\""))
-    (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"))
+(defvar inf-clojure-socket-repl-startup-forms
+  '((lein . "JVM_OPTS='-Dclojure.server.repl={:port %s :accept clojure.core.server/repl}' lein repl")
+    (boot . "export BOOT_JVM_OPTIONS='-Dclojure.server.repl=\"{:port %s :accept clojure.core.server/repl}\"' boot repl")
+    (clojure . "clojure -J-Dclojure.server.repl=\"{:port %s :accept clojure.core.server/repl}\"")
+    (cljs . "clojure -J-Dclojure.server.repl=\"{:port %s :accept cljs.server.browser/repl}\"")
+    (lein-clr . "JVM_OPTS='-Dclojure.server.repl={:port %s :accept clojure.core.server/repl}' lein clr repl")
     (planck . "planck -n %s")
     (babashka . "bb socket-repl %s")))
 
+(defcustom inf-clojure-socket-repl-port
+  nil
+  "Port to be used when creating a socket REPL via
+`inf-clojure-socket-repl'. If left as nil a random port will be
+selected between 5500-6000."
+  :type '(choice integer (const nil)))
+
 ;;;###autoload
-(defun inf-clojure-socket (&optional &rest args)
+(defun inf-clojure-socket-repl (cmd)
   "Starts a socket REPL server and connects to it via `inf-clojure'.
-ARGS are optional, in the case where PORT is not chosen one is
-randomly selected between 5500 and 6000. The default for
-REPL-TYPE is clojure. If you are inside a project, `inf-clojure-socket' will always run in the project directory.
-
-ARGS must come in pairs ATTRIBUTE VALUE.
-
-The following attributes are recognized:
-
-`:host'
-
-VALUE must be a string specifying the address that the socket is using. By default it is `localhost'
-
-`:port'
-
-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. Note that `joker' and `lumo' are not supported.
-
-`:project-name'
-
-VALUE can be any string, by default this is either derived from your current directory if you are inside a project or `standalone'
-
-`:opts'
-
-VALUE can be any string, by default this is nil and nothing is
-added to the startup form is chosen according to your
-`repl-type'. This is useful when you want to add some arguments
-or flags for your chosen tool. e.g `-Adev:test' for `clojure'"
-
-  (interactive)
-  (setq args (purecopy args)) ;; not sure if purecopy is useful, set-face-attribute does it.
-  (let* ((host (or (plist-get args :host) "localhost"))
-         (port (or (plist-get args :port) (+ 5500 (random 500))))
-         (repl-type (or (plist-get args :repl-type) "clojure"))
-         (opts (plist-get args :opts))
-         (project-name (or (plist-get args :project-name)
-                           (inf-clojure--project-name (or (clojure-project-dir)
-                                                          "standalone"))))
+CMD is the command line used to start the socket REPL, if this
+isn't provided you will be prompted to select from the defaults
+provided in `inf-clojure-socket-repl-startup-forms' or
+`inf-clojure-custom-startup' if this is defined."
+  (interactive (list (or (unless current-prefix-arg
+                           inf-clojure-custom-startup)
+                         (completing-read "Select Clojure REPL startup command: "
+                                          (mapcar #'cdr inf-clojure-socket-repl-startup-forms)
+                                          nil
+                                          'confirm-after-completion))))
+  (let* ((host "localhost")
+         (port (or inf-clojure-socket-repl-port (+ 5500 (random 500))))
+         (repl-type (or (unless prefix-arg
+                          inf-clojure-custom-repl-type)
+                        (car (rassoc cmd inf-clojure-socket-repl-startup-forms))
+                        (inf-clojure--prompt-repl-type)))
+         (project-name (inf-clojure--project-name (or (clojure-project-dir) "standalone")))
          (socket-process-name (format "*%s-%s-socket-server*" project-name repl-type))
          (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 (apply 'concat
-                            (format socket-form (number-to-string port))
-                            (when opts `(" " ,opts))))
-         (sock (let ((default-directory (or (clojure-project-dir)
-                                            default-directory)))
+         (socket-form (or (cdr (assoc repl-type inf-clojure-socket-repl-startup-forms))
+                          inf-clojure-custom-startup))
+         (socket-cmd (format socket-form (number-to-string port)))
+         (sock (let ((default-directory (or (clojure-project-dir) default-directory)))
                  (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 inf-clojure-custom-repl-type
-               (intern repl-type)
+         (setq inf-clojure-socket-repl-type
+               repl-type
                inf-clojure-custom-repl-name
                ;; comint mode includes the ** chars
                repl-buffer-name
@@ -978,7 +951,7 @@ or flags for your chosen tool. e.g `-Adev:test' for `clojure'"
           (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)))
+    (message "Starting %s socket REPL server at %s:%s with %s" repl-type host port socket-cmd)))
 
 
 (defun inf-clojure--forms-without-newlines (str)
@@ -1070,7 +1043,7 @@ Indent FORM.  FORM is expected to have been trimmed."
   (let ((clojure-process (inf-clojure-proc)))
     ;; ensure the repl buffer scrolls. See similar fix in CIDER:
     ;; https://github.com/clojure-emacs/cider/pull/2590
-    (with-selected-window (or (get-buffer-window (inf-clojure-buffer))
+    (with-selected-window (or (get-buffer-window inf-clojure-buffer)
                               (selected-window))
       (with-current-buffer (process-buffer clojure-process)
         (comint-goto-process-mark)