Insert flavor check before project type check

Author: arichiardi

inf-clojure.el

@@ -42,13 +42,9 @@
 (require 'clojure-mode)
 (require 'eldoc)
 (require 'thingatpt)
-<<<<<<< variant A
 (require 'ansi-color)
 (require 'cl-lib)
->>>>>>> variant B
 (require 'subr-x)
-####### Ancestor
-======= end
 
 
 (defgroup inf-clojure nil
@@ -189,6 +185,16 @@ often connecting to a remote REPL process."
   :type '(choice (string)
                  (cons string integer)))
 
+(defcustom inf-clojure-lumo-cmd "lumo -d"
+  "The command used to start a Lumo REPL.
+
+Alternative you can specify a TCP connection cons pair, instead
+of command, consisting of a host and port
+number (e.g. (\"localhost\" . 5555)).  That's useful if you're
+often connecting to a remote REPL process."
+  :type '(choice (string)
+                 (cons string integer)))
+
 (defcustom inf-clojure-load-command "(clojure.core/load-file \"%s\")\n"
   "Format-string for building a Clojure expression to load a file.
 This format string should use `%s' to substitute a file name
@@ -261,12 +267,12 @@ whichever process buffer you want to use.")
 
 (put 'inf-clojure-mode 'mode-class 'special)
 
-(defcustom inf-clojure-repl-default-flavor 'clojure
+(defcustom inf-clojure-repl-default-flavor nil
   "Symbol to define your default REPL flavor.
 The default flavor is clojure, lumo is the other supported
 one."
   :type '(choice (const :tag "Lumo" lumo)
-                 (other :tag "Clojure" clojure))
+                 (other :tag "Project driven" nil))
   :group 'inf-clojure)
 
 (defvar-local inf-clojure-repl-flavor inf-clojure-repl-default-flavor
@@ -275,13 +281,6 @@ Takes its root binding from inf-clojure-repl-default-flavor but
 can be further customized using either `setq-local` or an entry
 in `.dir-locals.el`." )
 
-(defun inf-clojure--flavor-setup ()
-  "Setup inf-clojure defcustoms depending on the choose flavor."
-  (pcase inf-clojure-repl-flavor
-    (lumo (inf-clojure--flavor-lumo-setup))
-    (clojure nil)
-    (_ (user-error "[inf-clojure] The specified flavor is not supported at the moment."))))
-
 (define-derived-mode inf-clojure-mode comint-mode "Inferior Clojure"
   "Major mode for interacting with an inferior Clojure process.
 Runs a Clojure interpreter as a subprocess of Emacs, with Clojure
@@ -391,12 +390,21 @@ Fallback to `default-directory.' if not within a project."
           ((file-exists-p "build.boot") "boot")
           (t nil))))
 
+(defun inf-clojure-flavor-cmd ()
+  "Determine the flavor of the project.
+Return nil if no flavor has been specified"
+  (pcase inf-clojure-repl-flavor
+    (lumo inf-clojure-lumo-cmd)
+    (_ nil)))
+
 (defun inf-clojure-cmd (project-type)
   "Determine the command `inf-clojure' needs to invoke for the PROJECT-TYPE."
-  (pcase project-type
-    ("lein" inf-clojure-lein-cmd)
-    ("boot" inf-clojure-boot-cmd)
-    (_ inf-clojure-generic-cmd)))
+  (if-let ((flavor-command (inf-clojure-flavor-cmd)))
+      flavor-command
+    (pcase project-type
+      ("lein" inf-clojure-lein-cmd)
+      ("boot" inf-clojure-boot-cmd)
+      (_ inf-clojure-generic-cmd))))
 
 (defun inf-clojure-clear-repl-buffer ()
   "Clear the REPL buffer."
@@ -926,61 +934,20 @@ to suppress the usage of the target buffer discovery logic."
 ;;;; Lumo
 ;;;; ====
 
-(defgroup lumo nil
-  "Run an external Lumo process (REPL) in an Emacs buffer."
-  :group 'inf-clojure)
-
-(defcustom inf-clojure-lumo-command "lumo"
-  "The command used to launch lumo."
-  :type 'string
-  :group 'lumo)
-
-(defcustom inf-clojure-lumo-args "-d"
-  "The command arguments used to launch lumo."
-  :type 'string
-  :group 'lumo)
-
-;; AR - TODO Alternatively you can specify a command string that will be called,
-;; which should return a string.
-(defcustom inf-clojure-lumo-classpath-generator "cp"
-  "The file used to create the classpath string.
-The classpath string has to be a \":\" separated list of dir and
-files."
-  :type 'string
-  :group 'lumo)
-
-;; AR - not used but left here because it is a possible sanity check
-(defun inf-clojure--lumo-mode-p ()
-  "Return true if the lumo is the target REPL."
-  (comint-send-string (inf-clojure-proc) "(js/global.hasOwnProperty \"$$LUMO_GLOBALS\")"))
-
-(defun inf-clojure--lumo-repl-command ()
-  "Return inf-clojure-program for lumo."
-  (concat inf-clojure-lumo-command
-          " "
-          (when (not (string-empty-p inf-clojure-lumo-classpath-generator))
-            (concat inf-clojure-lumo-args " "))
-          "-c " (inf-clojure--read-classpath inf-clojure-lumo-classpath-generator)))
-
-(defun inf-clojure--flavor-lumo-setup ()
-  "Setup defcustoms for the Lumo flavor."
-  ;; The defcustoms for the following are already ok:
-  ;;  * inf-clojure-set-ns-command
-  ;;  * inf-clojure-macroexpand-command
-  ;;  * inf-clojure-macroexpand-1-command
-  ;;
-  ;; https://github.com/anmonteiro/lumo/issues/84
-  ;; (setq inf-clojure-var-source-command "(lumo.repl/source %s)")
-  ;; https://github.com/anmonteiro/lumo/issues/87
-  ;; (setq inf-clojure-ns-vars-command "(lumo.repl/dir %s)")
-  ;; https://github.com/anmonteiro/lumo/issues/86
-  ;; (setq inf-clojure-var-apropos-command "(lumo.repl/apropos %s)")
-
-  ;; Uncomment after https://github.com/anmonteiro/lumo/pull/88
-  ;; (setq inf-clojure-arglist-command "(lumo.repl/get-arglists \"%s\")")
-  (setq inf-clojure-var-doc-command "(lumo.repl/doc %s)")
-  (setq inf-clojure-completion-command "(or (doall (map str (lumo.repl/get-completions \"%s\")) '())")
-  (inf-clojure--maybe-set-program (inf-clojure--lumo-repl-command)))
+;; The defcustoms for the following are already ok:
+;;  * inf-clojure-set-ns-command
+;;  * inf-clojure-macroexpand-command
+;;  * inf-clojure-macroexpand-1-command
+;;
+;; TODOs
+;; https://github.com/anmonteiro/lumo/issues/84
+;; (setq inf-clojure-var-source-command "(lumo.repl/source %s)")
+;; https://github.com/anmonteiro/lumo/issues/87
+;; (setq inf-clojure-ns-vars-command "(lumo.repl/dir %s)")
+;; https://github.com/anmonteiro/lumo/issues/86
+;; (setq inf-clojure-var-apropos-command "(lumo.repl/apropos %s)")
+;; https://github.com/anmonteiro/lumo/pull/88
+;; (setq inf-clojure-arglist-command "(lumo.repl/get-arglists \"%s\")")
 
 (provide 'inf-clojure)
 ;;; inf-clojure.el ends here