[clojure-emacs#209] remove cljs/dual buffer & keep this PR simple

Author: Mike Bruce

inf-clojure.el

@@ -179,9 +179,6 @@ 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-cljs-buffer nil
-  "The current `inf-clojure' process buffer with repl-type `cljs'")
-
 (defvar inf-clojure-buffer nil
   "The current `inf-clojure' process buffer.
 
@@ -218,11 +215,6 @@ one process, this does the right thing.  If you run multiple
 processes, you might need to change `inf-clojure-buffer' to
 whichever process buffer you want to use.")
 
-(defun inf-clojure--get-buffer ()
-  (if (eq major-mode 'clojurescript-mode)
-      inf-clojure-cljs-buffer
-    inf-clojure-buffer))
-
 (defun inf-clojure--get-feature (repl-type feature no-error)
   "Get FEATURE for REPL-TYPE from repl-features.
 If no-error is truthy don't error if feature is not present."
@@ -264,13 +256,9 @@ When NO-ERROR is non-nil, don't throw an error when no process
 has been found.  See also variable `inf-clojure-buffer'."
   (or (get-buffer-process (if (derived-mode-p 'inf-clojure-mode)
                               (current-buffer)
-                            (inf-clojure--get-buffer)))
+                            inf-clojure-buffer))
       (unless no-error
-        (let ((subprocess-type (if (eq major-mode 'clojurescript-mode)
-                                   "Clojurescript" "Clojure"))
-              (buffer-name (if (eq major-mode 'clojurescript-mode)
-                               "inf-clojure-cljs-buffer" "inf-clojure-buffer")))
-          (error "No %s subprocess; see variable `%s'" subprocess-type buffer-name)))))
+        (error "No Clojure subprocess; see variable `inf-clojure-buffer'"))))
 
 (defun inf-clojure-repl-p (&optional buf)
   "Indicates if BUF is an inf-clojure REPL.
@@ -311,9 +299,7 @@ buffers after they are created with `rename-buffer'."
                       (not (inf-clojure-repl-p)))
                   (inf-clojure--prompt-repl-buffer "Select default REPL: ")
                 (current-buffer))))
-    (if (eq inf-clojure-repl-type 'cljs)
-        (setq inf-clojure-cljs-buffer new-repl-buffer)
-      (setq inf-clojure-buffer new-repl-buffer))
+    (setq inf-clojure-buffer new-repl-buffer)
     (message "Current inf-clojure REPL set to %s" new-repl-buffer)))
 
 (defvar inf-clojure--repl-type-lock nil
@@ -358,12 +344,11 @@ 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")))
+  (if (and (bufferp inf-clojure-buffer)
+           (buffer-live-p inf-clojure-buffer))
+      (with-current-buffer inf-clojure-buffer
+        (format "%s(%s)" (buffer-name (current-buffer)) inf-clojure-repl-type))
+    "no process"))
 
 (defvar inf-clojure-mode-map
   (let ((map (make-sparse-keymap)))
@@ -754,10 +739,9 @@ to continue it."
   "Switch to the inferior Clojure process buffer.
 With prefix argument EOB-P, positions cursor at end of buffer."
   (interactive "P")
-  (let ((inf-buffer (inf-clojure--get-buffer)))
-    (if (get-buffer-process inf-buffer)
-        (inf-clojure--swap-to-buffer-window inf-buffer)
-      (call-interactively #'inf-clojure)))
+  (if (get-buffer-process inf-clojure-buffer)
+      (inf-clojure--swap-to-buffer-window inf-buffer)
+    (call-interactively #'inf-clojure))
   (when eob-p
     (push-mark)
     (goto-char (point-max))))
@@ -801,6 +785,8 @@ to suppress the usage of the target buffer discovery logic."
 The name is simply the final segment of the path."
   (file-name-nondirectory (directory-file-name dir)))
 
+;; TODO add entrypoint here!!
+;; include :connection-method (shorter name!)
 ;;;###autoload
 (defun inf-clojure (cmd)
   "Run an inferior Clojure process, input and output via buffer `*inf-clojure*'.
@@ -834,9 +820,9 @@ process buffer for a list of commands.)"
          ;; 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))))
+                          inf-clojure-custom-repl-type)
+                        (car (rassoc cmd inf-clojure-startup-forms))
+                        (inf-clojure--prompt-repl-type))))
     ;; 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
@@ -852,9 +838,7 @@ process buffer for a list of commands.)"
           (setq-local inf-clojure-repl-type repl-type)
           (hack-dir-local-variables-non-file-buffer))))
     ;; update the default comint buffer and switch to it
-    (if (eq repl-type 'cljs)
-        (setq inf-clojure-cljs-buffer (get-buffer repl-buffer-name))
-        (setq inf-clojure-buffer (get-buffer repl-buffer-name)))
+    (setq inf-clojure-buffer (get-buffer repl-buffer-name))
     (if inf-clojure-repl-use-same-window
         (pop-to-buffer-same-window repl-buffer-name)
       (pop-to-buffer repl-buffer-name))))
@@ -873,17 +857,6 @@ 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
-  :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.
 This function prints out the output received but also
@@ -959,13 +932,21 @@ VALUE must be a valid repl type, given as a string e.g clojure/cljs/lein/babashk
 
 `: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'"
+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"))))
@@ -974,15 +955,14 @@ VALUE can be any string, by default this is either derived from your current dir
          (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")
-                                    (concat " " inf-clojure-cli-args))
-                                   ((string= repl-type "cljs")
-                                    (concat " " inf-clojure-cljs-cli-args))
-                                   (t nil))))
-         (sock (start-file-process-shell-command
-                socket-process-name socket-buffer
-                socket-cmd)))
+         (socket-cmd (apply 'concat
+                            (format socket-form (number-to-string port))
+                            (when opts `(" " ,opts))))
+         (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