Better connection types retrival

  - new function `cider-project-connections-types`
  - `cider-connection-type-for-buffer` returns "multi" in cljc an cljx

Author: vspinu

CHANGELOG.md

@@ -29,6 +29,7 @@
 * [#1991](https://github.com/clojure-emacs/cider/issues/1832): Make it possible to disable the prompt to open a ClojureScript in a browser on connect via `cider-offer-to-open-cljs-app-in-browser`.
 * [#1995](https://github.com/clojure-emacs/cider/pull/1995): Add new customization variable `cider-doc-auto-select-buffer` to control cider-doc popup buffer auto selection.
 * Ensure that `cider-switch-to-repl-buffer` picks the most recent repl buffer if multiple connections are available.
+* Add new function `cider-project-connections-types`.
 
 ### Changes
 
@@ -43,6 +44,7 @@
 
 ### Bugs Fixed
 
+* [#2040](https://github.com/clojure-emacs/cider/issues/2040): Fix fontification of conditional expressions in cljc files.
 * [#2018](https://github.com/clojure-emacs/cider/issues/2018): Don't delete wrong overlays during code evaluation.
 * [#1699](https://github.com/clojure-emacs/cider/issues/1699): Fix "Method code too large!" error that occurred during instrumentation for debugging.
 * [#1987](https://github.com/clojure-emacs/cider/issues/1987): Fix: Update faces when disabling a theme

cider-client.el

@@ -137,7 +137,7 @@ Also close associated REPL and server buffers."
 
 
 ;;; Current connection logic
-(defvar-local cider-repl-type "clj"
+(defvar-local cider-repl-type nil
   "The type of this REPL buffer, usually either \"clj\" or \"cljs\".")
 
 (defun cider-find-connection-buffer-for-project-directory (&optional project-directory all-connections)
@@ -178,6 +178,23 @@ connections are returned, instead of just the most recent."
             cider-connections
           (car cider-connections)))))
 
+(defun cider-connection-type-for-buffer ()
+  "Return the matching connection type (clj or cljs) for the current buffer.
+In cljc and cljx buffers return \"multi\". This function infers connection
+type based on the major mode. See `cider-project-connections-types' for a
+list of types of actual connections within a project."
+  (cond
+   ((derived-mode-p 'clojurescript-mode) "cljs")
+   ((derived-mode-p 'clojurec-mode) "multi")
+   ((derived-mode-p 'clojurex-mode) "multi")
+   ((derived-mode-p 'clojure-mode) "clj")
+   (cider-repl-type)))
+
+(defun cider-project-connections-types ()
+  "Return a list of types of connections within current project."
+  (let ((connections (cider-find-connection-buffer-for-project-directory nil :all-connections)))
+    (seq-uniq (seq-map #'cider--connection-type connections))))
+
 (defun cider-read-connection (prompt)
   "Completing read for connections using PROMPT."
   (get-buffer (completing-read prompt (mapcar #'buffer-name (cider-connections)))))
@@ -221,14 +238,6 @@ such a link cannot be established automatically."
   (cider-ensure-connected)
   (kill-local-variable 'cider-connections))
 
-(defun cider-connection-type-for-buffer ()
-  "Return the matching connection type (clj or cljs) for the current buffer."
-  (cond
-   ((derived-mode-p 'clojurescript-mode) "cljs")
-   ((derived-mode-p 'clojure-mode) "clj")
-   (cider-repl-type)
-   (t "clj")))
-
 (defun cider-toggle-request-dispatch ()
   "Toggle the value of `cider-request-dispatch' between static and dynamic.
 

cider-repl.el

@@ -247,7 +247,8 @@ ENDPOINT is a plist as returned by `nrepl-connect'."
         (rename-buffer buff-name)))
     (with-current-buffer (get-buffer-create buff-name)
       (unless (derived-mode-p 'cider-repl-mode)
-        (cider-repl-mode))
+        (cider-repl-mode)
+        (setq cider-repl-type "clj"))
       (setq nrepl-err-handler #'cider-default-err-handler)
       (cider-repl-reset-markers)
       (add-hook 'nrepl-response-handler-functions #'cider-repl--state-handler nil 'local)

cider.el

@@ -546,6 +546,7 @@ should be the regular Clojure REPL started by the server process filter."
       ;; original Clojure REPL.  Our solution is to bump the original REPL back
       ;; up the list, so it takes priority on Clojure requests.
       (cider-make-connection-default client-buffer)
+      (setq cider-repl-type "cljs")
       (pcase (assoc cljs-repl-form cider--cljs-repl-types)
         (`(,_ ,name ,info)
          (message "Starting a %s REPL%s" name (or info "")))

test/cider-tests.el

@@ -43,10 +43,12 @@
       (let ((b1 (current-buffer)))
         (setq-local nrepl-endpoint '("localhost" 4005))
         (setq-local nrepl-project-dir "proj")
+        (setq-local cider-repl-type "clj")
         (with-temp-buffer
           (rename-buffer "*cider-repl test2*")
           (let ((b2 (current-buffer)))
             (setq-local nrepl-endpoint '("123.123.123.123" 4006))
+            (setq-local cider-repl-type "clj")
             (let ((cider-connections (list b1 b2)))
               (cider-connection-browser)
               (with-current-buffer "*cider-connections*"