Put startup command in repl banner, cljs outside

Author: dpsutton

cider-repl.el

@@ -319,7 +319,8 @@ fully initialized."
     ((pred identity) (pop-to-buffer buffer)))
   (with-current-buffer buffer
     (cider-repl--insert-banner)
-    (cider-repl--insert-startup-commands)
+    (cider-repl--insert-param-values `((:cljs-repl-type "cljs repl type:" ,#'symbol-name)
+                                       (:repl-init-form "cljs repl startup command:")))
     (when-let* ((window (get-buffer-window buffer t)))
       (with-selected-window window
         (recenter (- -1 scroll-margin))))
@@ -334,27 +335,25 @@ fully initialized."
     (insert-before-markers
      (propertize (cider-repl--help-banner) 'font-lock-face 'font-lock-comment-face))))
 
-(defun cider-repl--insert-startup-commands ()
-  "Insert the commands used to create the repl."
-  (let ((params cider-saved-params))
-    (cl-labels
-        ((emit-comment
-          (string)
-          (insert-before-markers
-           (propertize string 'font-lock-face 'font-lock-comment-face)))
-         (emit-command
-          (desc prop &optional transform)
-          (let ((transform (or transform #'identity)))
-            (when-let ((command (plist-get params prop)))
-              (emit-comment
-               (concat ";; " desc "\n;; " (funcall transform command) "\n"))))))
-      (emit-comment ";;\n")
-      (emit-command "repl startup command:" :jack-in-cmd)
-      (when (plist-get params :repl-init-form)
-        (emit-comment ";;\n")
-        (emit-command "repl type:" :cljs-repl-type #'symbol-name)
-        (emit-command "cljs startup command:" :repl-init-form))
-      (emit-comment "\n"))))
+(defun cider-repl--insert-param-values (param-tuples)
+  "Insert the values from params specified in PARAM-TUPLES.
+PARAM-TUPLES are tuples of (param-key description) or (param-key
+description transform) where transform is called with the param-value if
+present."
+  (cl-labels
+      ((emit-comment
+        (string)
+        (insert-before-markers
+         (propertize
+          (if (string-blank-p string) ";;\n" (concat ";; " string "\n"))
+          'font-lock-face 'font-lock-comment-face))))
+    (mapc (lambda (param-tuple)
+            (cl-destructuring-bind (param-key desc &optional transform) param-tuple
+              (when-let ((value (plist-get cider-saved-params param-key)))
+                (emit-comment "")
+                (emit-comment (concat desc ": " (funcall (or transform #'identity) value))))))
+          param-tuples)
+    (emit-comment "")))
 
 (defun cider-repl--banner ()
   "Generate the welcome REPL buffer banner."
@@ -367,13 +366,15 @@ fully initialized."
 ;;  Javadoc: (javadoc java-object-or-class)
 ;;     Exit: <C-c C-q>
 ;;  Results: Stored in vars *1, *2, *3, an exception in *e;
+;;  Startup: %s
 "
           (plist-get nrepl-endpoint :host)
           (plist-get nrepl-endpoint :port)
           (cider--version)
           (cider--nrepl-version)
           (cider--clojure-version)
-          (cider--java-version)))
+          (cider--java-version)
+          (plist-get cider-saved-params :jack-in-cmd)))
 
 (defun cider-repl--help-banner ()
   "Generate the help banner."

test/cider-repl-tests.el

@@ -38,7 +38,8 @@
     (spy-on 'cider--nrepl-version :and-return-value "0.5.3")
     (setq nrepl-endpoint (list :host "localhost" :port "54018"))
     (setq cider-version "0.12.0")
-    (setq cider-codename "Seattle"))
+    (setq cider-codename "Seattle")
+    (setq cider-saved-params (list :jack-in-cmd "startup command")))
 
   (describe "when the cider package version information is available"
     (it "returns the repl banner string"
@@ -53,6 +54,7 @@
 ;;  Javadoc: (javadoc java-object-or-class)
 ;;     Exit: <C-c C-q>
 ;;  Results: Stored in vars *1, *2, *3, an exception in *e;
+;;  Startup: startup command
 ")))
 
   (describe "when the cider package version information is not available"
@@ -68,6 +70,7 @@
 ;;  Javadoc: (javadoc java-object-or-class)
 ;;     Exit: <C-c C-q>
 ;;  Results: Stored in vars *1, *2, *3, an exception in *e;
+;;  Startup: startup command
 "))))
 
 (defvar cider-testing-ansi-colors-vector