Add preliminary support for clojure-ts-mode

This does NOT intended to break the dependency from cider to
clojure-mode. It is intended to make CIDER work with clojure-ts-mode.

Some functionality like clojure-find-ns, clojulore-find-def, etc will
still require clojure-mode in order for CIDER to get it's work done.

Author: dannyfreeman

CHANGELOG.md

@@ -14,6 +14,7 @@
 - [#3354](https://github.com/clojure-emacs/cider/issues/3354): Add new customization variable `cider-reuse-dead-repls` to control how dead REPL buffers are reused on new connections.
 - [#3364](https://github.com/clojure-emacs/cider/pull/3364): Update enrich-classpath, adding Clojure CLI compatibility, and reworking its integration into CIDER.
   * It will be progressively refined and documented, please consider this alpha software.
+- Basic support for using CIDER from [clojure-ts-mode](https://github.com/clojure-emacs/clojure-ts-mode) 
 
 ### Bugs fixed
 

cider-completion.el

@@ -152,7 +152,7 @@ form, with symbol at point replaced by __prefix__."
                           ;; Important because `beginning-of-defun' and
                           ;; `ending-of-defun' work incorrectly in the REPL
                           ;; buffer, so context extraction fails there.
-                          (derived-mode-p 'clojure-mode))
+                          (derived-mode-p 'clojure-mode 'clojure-ts-mode))
                      ;; We use ignore-errors here since grabbing the context
                      ;; might fail because of unbalanced parens, or other
                      ;; technical reasons, yet we don't want to lose all

cider-connection.el

@@ -310,6 +310,7 @@ message in the REPL area."
 See command `cider-mode'."
   (interactive)
   (add-hook 'clojure-mode-hook #'cider-mode)
+  (add-hook 'clojure-ts-mode-hook #'cider-mode)
   (dolist (buffer (cider-util--clojure-buffers))
     (with-current-buffer buffer
       (unless cider-mode
@@ -803,9 +804,10 @@ multi.  This function infers connection type based on the major mode.
 For the REPL type use the function `cider-repl-type'."
   (with-current-buffer (or buffer (current-buffer))
     (cond
-     ((derived-mode-p 'clojurescript-mode) 'cljs)
-     ((derived-mode-p 'clojurec-mode) cider-clojurec-eval-destination)
-     ((derived-mode-p 'clojure-mode) 'clj)
+     ((derived-mode-p 'clojurescript-mode 'clojurescript-ts-mode) 'cljs)
+     ((derived-mode-p 'clojurec-mode 'clojurec-ts-mode)
+      cider-clojurec-eval-destination)
+     ((derived-mode-p 'clojure-mode 'clojure-ts-mode) 'clj)
      (cider-repl-type))))
 
 (defun cider-set-repl-type (&optional type)

cider-mode.el

@@ -546,14 +546,16 @@ higher precedence."
                            (cider--menu-add-help-strings (symbol-value variable))))
     map))
 
-;; This menu works as an easy entry-point into CIDER.  Even if cider.el isn't
-;; loaded yet, this will be shown in Clojure buffers next to the "Clojure"
-;; menu.
 ;;;###autoload
-(with-eval-after-load 'clojure-mode
-  (easy-menu-define cider-clojure-mode-menu-open clojure-mode-map
+(defun cider--setup-menu-for-clojure-major-mode (mode-map)
+  "Setup a Cider menu for a Clojure major mode's MODE-MAP.
+
+This menu works as an easy entry-point into CIDER.  Even if cider.el isn't
+loaded yet, this will be shown in Clojure buffers next to the Clojure menu."
+  (easy-menu-define cider-clojure-mode-menu-open mode-map
     "Menu for Clojure mode.
-  This is displayed in `clojure-mode' buffers, if `cider-mode' is not active."
+  This is displayed in `clojure-mode' and `clojure-ts-mode' buffers,
+  if `cider-mode' is not active."
     `("CIDER" :visible (not cider-mode)
       ["Start a Clojure REPL" cider-jack-in-clj
        :help "Starts an nREPL server and connects a Clojure REPL to it."]
@@ -568,6 +570,14 @@ higher precedence."
       "--"
       ["View user manual" cider-view-manual])))
 
+;;;###autoload
+(with-eval-after-load 'clojure-mode
+  (cider--setup-menu-for-clojure-major-mode clojure-mode-map))
+
+;;;###autoload
+(with-eval-after-load 'clojure-ts-mode
+  (cider--setup-menu-for-clojure-major-mode clojure-ts-mode-map))
+
 ;;; Dynamic indentation
 (defcustom cider-dynamic-indentation t
   "Whether CIDER should aid Clojure(Script) indentation.

cider-ns.el

@@ -78,7 +78,7 @@ If t, save the files without confirmation."
   :group 'cider
   :package-version '(cider . "0.15.0"))
 
-(defcustom cider-ns-save-files-on-refresh-modes '(clojure-mode)
+(defcustom cider-ns-save-files-on-refresh-modes '(clojure-mode clojure-ts-mode)
   "Controls which files might be saved before refreshing.
 If a list of modes, any buffers visiting files on the classpath whose major
 mode is derived from any of the modes might be saved.

cider-selector.el

@@ -49,15 +49,18 @@ DESCRIPTION is a one-line description of what the key selects.")
 Not meant to be set by users.  It's used internally
 by `cider-selector'.")
 
-(defun cider-selector--recently-visited-buffer (mode &optional consider-visible-p)
-  "Return the most recently visited buffer, deriving its `major-mode' from MODE.
+(defun cider-selector--recently-visited-buffer (modes &optional consider-visible-p)
+  "Return the most recently visited buffer, deriving its `major-mode' from MODES.
+MODES may be a symbol for a single mode, or a list of mode symbols.
 CONSIDER-VISIBLE-P will allow handling of visible windows as well.
 First pass only considers buffers that are not already visible.
 Second pass will attempt one of visible ones for scenarios where the window
 is visible, but not focused."
   (cl-loop for buffer in (buffer-list)
            when (and (with-current-buffer buffer
-                       (derived-mode-p mode))
+                       (apply #'derived-mode-p (if (listp modes)
+                                                   modes
+                                                 (list modes))))
                      ;; names starting with space are considered hidden by Emacs
                      (not (string-match-p "^ " (buffer-name buffer)))
                      (or consider-visible-p
@@ -134,7 +137,7 @@ is chosen.  The returned buffer is selected with
 
 (def-cider-selector-method ?c
   "Most recently visited clojure-mode buffer."
-  (cider-selector--recently-visited-buffer 'clojure-mode))
+  (cider-selector--recently-visited-buffer '(clojure-mode clojure-ts-mode)))
 
 (def-cider-selector-method ?e
   "Most recently visited emacs-lisp-mode buffer."

cider-util.el

@@ -60,7 +60,9 @@ Setting this to nil removes the fontification restriction."
 (defun cider-util--clojure-buffers ()
   "Return a list of all existing `clojure-mode' buffers."
   (seq-filter
-   (lambda (buffer) (with-current-buffer buffer (derived-mode-p 'clojure-mode)))
+   (lambda (buffer)
+     (with-current-buffer buffer
+       (derived-mode-p 'clojure-mode 'clojure-ts-mode)))
    (buffer-list)))
 
 (defun cider-current-dir ()

cider.el

@@ -2090,18 +2090,31 @@ alternative to the default is `cider-random-tip'."
 
 (add-hook 'cider-connected-hook #'cider--maybe-inspire-on-connect)
 
+;;;###autoload
+(defun cider--setup-clojure-major-mode (mode)
+  "Setup Cider key bindings and hooks for a Clojure major MODE."
+  (cl-flet ((concat-symbol (symbol suffix)
+              (intern (concat (symbol-name mode) suffix))))
+    (let ((mode-map (eval (concat-symbol mode "-map"))))
+      (define-key mode-map (kbd "C-c M-x") #'cider)
+      (define-key mode-map (kbd "C-c M-j") #'cider-jack-in-clj)
+      (define-key mode-map (kbd "C-c M-J") #'cider-jack-in-cljs)
+      (define-key mode-map (kbd "C-c M-c") #'cider-connect-clj)
+      (define-key mode-map (kbd "C-c M-C") #'cider-connect-cljs)
+      (define-key mode-map (kbd "C-c C-x") 'cider-start-map)
+      (define-key mode-map (kbd "C-c C-s") 'sesman-map)
+      (require 'sesman)
+      (sesman-install-menu mode-map)
+      (add-hook (concat-symbol mode "-hook")
+                (lambda () (setq-local sesman-system 'CIDER))))))
+
 ;;;###autoload
 (with-eval-after-load 'clojure-mode
-  (define-key clojure-mode-map (kbd "C-c M-x") #'cider)
-  (define-key clojure-mode-map (kbd "C-c M-j") #'cider-jack-in-clj)
-  (define-key clojure-mode-map (kbd "C-c M-J") #'cider-jack-in-cljs)
-  (define-key clojure-mode-map (kbd "C-c M-c") #'cider-connect-clj)
-  (define-key clojure-mode-map (kbd "C-c M-C") #'cider-connect-cljs)
-  (define-key clojure-mode-map (kbd "C-c C-x") 'cider-start-map)
-  (define-key clojure-mode-map (kbd "C-c C-s") 'sesman-map)
-  (require 'sesman)
-  (sesman-install-menu clojure-mode-map)
-  (add-hook 'clojure-mode-hook (lambda () (setq-local sesman-system 'CIDER))))
+  (cider--setup-clojure-major-mode 'clojure-mode))
+
+;;;###autoload
+(with-eval-after-load 'clojure-ts-mode
+  (cider--setup-clojure-major-mode 'clojure-ts-mode))
 
 (provide 'cider)