Updating Doom Emacs.

.emacs.d/modules/lang/clojure/config.el

@@ -5,19 +5,32 @@
 
 ;; Large clojure buffers tend to be slower than large buffers of other modes, so
 ;; it should have a lower threshold too.
-(add-to-list 'doom-large-file-size-alist '(clojure-mode . 0.5))
+(add-to-list 'doom-large-file-size-alist '("\\.\\(?:clj[sc]?\\|dtm\\|edn\\)\\'" . 0.5))
 
 
 ;;
 ;;; Packages
 
-;;;###package clojure-mode
-(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
+(use-package! clojure-mode
+  :hook (clojure-mode . rainbow-delimiters-mode)
+  :config
+  (when (featurep! +lsp)
+    (add-hook! '(clojure-mode-local-vars-hook
+                 clojurec-mode-local-vars-hook
+                 clojurescript-mode-local-vars-hook)
+      (defun +clojure-disable-lsp-indentation-h ()
+        (setq-local lsp-enable-indentation nil))
+      #'lsp!)
+    (after! lsp-clojure
+      (dolist (m '(clojure-mode
+                   clojurec-mode
+                   clojurescript-mode
+                   clojurex-mode))
+        (add-to-list 'lsp-language-id-configuration (cons m "clojure"))))))
 
 
 (use-package! cider
-  ;; NOTE: if you don't have an org directory set (the dir doesn't exist), cider
-  ;; jack in won't work.
+  ;; NOTE if `org-directory' doesn't exist, `cider-jack' in won't work
   :hook (clojure-mode-local-vars . cider-mode)
   :init
   (after! clojure-mode
@@ -26,7 +39,7 @@
     (set-eval-handler! '(clojure-mode clojurescript-mode) #'cider-eval-region))
   :config
   (add-hook 'cider-mode-hook #'eldoc-mode)
-  (set-lookup-handlers! 'cider-mode
+  (set-lookup-handlers! '(cider-mode cider-repl-mode)
     :definition #'+clojure-cider-lookup-definition
     :documentation #'cider-doc)
   (set-popup-rules!
@@ -46,13 +59,18 @@
         cider-repl-history-quit-action 'delete-and-restore
         cider-repl-history-highlight-inserted-item t
         cider-repl-history-size 1000
-        cider-repl-pop-to-buffer-on-connect 'display-only
         cider-repl-result-prefix ";; => "
         cider-repl-print-length 100
         cider-repl-use-clojure-font-lock t
         cider-repl-use-pretty-printing t
         cider-repl-wrap-history nil
-        cider-stacktrace-default-filters '(tooling dup))
+        cider-stacktrace-default-filters '(tooling dup)
+
+        ;; Don't focus the CIDER REPL when it starts. Since it can take so long
+        ;; to start up, you either wait for a minute doing nothing or be
+        ;; prepared for your cursor to suddenly change buffers without warning.
+        ;; See https://github.com/clojure-emacs/cider/issues/1872
+        cider-repl-pop-to-buffer-on-connect 'display-only)
 
   ;; Error messages emitted from CIDER is silently funneled into *nrepl-server*
   ;; rather than the *cider-repl* buffer. How silly. We might want to see that
@@ -78,6 +96,8 @@
             "\"" #'cider-jack-in-cljs
             "c"  #'cider-connect-clj
             "C"  #'cider-connect-cljs
+            "m"  #'cider-macroexpand-1
+            "M"  #'cider-macroexpand-all
             (:prefix ("e" . "eval")
               "b" #'cider-eval-buffer
               "d" #'cider-eval-defun-at-point
@@ -94,16 +114,14 @@
             (:prefix ("h" . "help")
               "n" #'cider-find-ns
               "a" #'cider-apropos
+              "c" #'cider-clojuredocs
               "d" #'cider-doc
-              "g" #'cider-grimoire-web
-              "j" #'cider-javadoc)
+              "j" #'cider-javadoc
+              "w" #'cider-clojuredocs-web)
             (:prefix ("i" . "inspect")
               "e" #'cider-enlighten-mode
               "i" #'cider-inspect
               "r" #'cider-inspect-last-result)
-            (:prefix ("m" . "macro")
-              "e" #'cider-macroexpand-1
-              "E" #'cider-macroexpand-all)
             (:prefix ("n" . "namespace")
               "n" #'cider-browse-ns
               "N" #'cider-browse-ns-all
@@ -111,7 +129,7 @@
             (:prefix ("r" . "repl")
               "n" #'cider-repl-set-ns
               "q" #'cider-quit
-              "r" #'cider-refresh
+              "r" #'cider-ns-refresh
               "R" #'cider-restart
               "b" #'cider-switch-to-repl-buffer
               "B" #'+clojure/cider-switch-to-repl-buffer-and-switch-ns
@@ -146,6 +164,25 @@
           :i "U"  #'cider-repl-history-undo-other-window)))
 
 
+(after! cider-doc
+  ;; Fixes raxod502/radian#446: CIDER tries to do color calculations when it's
+  ;; loaded, sometimes too early, causing errors. Better to wait until something
+  ;; is actually rendered.
+  (setq cider-docview-code-background-color nil)
+
+  (defadvice! +clojure--defer-color-calculation-a (&rest _)
+    "Set `cider-docview-code-background-color'.
+This is needed because we have ripped out the code that would normally set it
+(since that code will run during early init, which is a problem)."
+    :before #'cider-docview-fontify-code-blocks
+    (setq cider-docview-code-background-color (cider-scale-background-color)))
+
+  ;; HACK Disable cider's advice on these; and hope no one else is using these
+  ;;      old-style advice.
+  (ad-deactivate #'enable-theme)
+  (ad-deactivate #'disable-theme))
+
+
 (use-package! clj-refactor
   :hook (clojure-mode . clj-refactor-mode)
   :config
@@ -156,6 +193,6 @@
         :desc "refactor" "R" #'hydra-cljr-help-menu/body))
 
 
-(use-package! flycheck-joker
-  :when (featurep! :tools flycheck)
+(use-package! flycheck-clj-kondo
+  :when (featurep! :checkers syntax)
   :after flycheck)