diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el index 73cc7da6b..cd5871677 100644 --- a/modules/lang/clojure/config.el +++ b/modules/lang/clojure/config.el @@ -37,6 +37,14 @@ (set-repl-handler! 'clojure-mode #'+clojure/open-repl :persist t) (set-repl-handler! 'clojurescript-mode #'+clojure/open-cljs-repl :persist t) (set-eval-handler! '(clojure-mode clojurescript-mode) #'cider-eval-region)) + + ;; HACK Fix raxod502/radian#446: CIDER tries to calculate the frame's + ;; background too early; sometimes before the initial frame has been + ;; initialized, causing errors. + (defvar cider-docview-code-background-color nil) + (defvar cider-stacktrace-frames-background-color nil) + (add-transient-hook! #'cider-docview-fontify-code-blocks (cider--docview-adapt-to-theme)) + (add-transient-hook! #'cider-stacktrace-render-cause (cider--stacktrace-adapt-to-theme)) :config (add-hook 'cider-mode-hook #'eldoc-mode) (set-lookup-handlers! '(cider-mode cider-repl-mode) @@ -223,25 +231,6 @@ :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 diff --git a/modules/lang/clojure/packages.el b/modules/lang/clojure/packages.el index 71cc86eb9..4bcc529d8 100644 --- a/modules/lang/clojure/packages.el +++ b/modules/lang/clojure/packages.el @@ -14,8 +14,8 @@ (package! parseedn :pin "e5ba280d1fb7b408d54062d4eac545326e850172") ;;; Core packages -(package! clojure-mode :pin "e1dc7caee76d117a366f8b8b1c2da7e6400636a8") -(package! clj-refactor :pin "4cb75bd6a2fcb376455e8b4f3edee509f87b86b8") -(package! cider :pin "7228402c093a7660a6bee6e4c1c69cce81703013") +(package! clojure-mode :pin "e31186843d06ea86f3771244d1cde0112f9e2079") +(package! clj-refactor :pin "12af23ad8b76519cb8b95eec4e8a5706d3186cd0") +(package! cider :pin "af2e1649981729930efbbf58af232b3e413da0af") (when (featurep! :checkers syntax) - (package! flycheck-clj-kondo :pin "a558bda44c4cb65b69fa53df233e8941ebd195c5")) + (package! flycheck-clj-kondo :pin "d8a6ee9a16aa24b5be01f1edf9843d41bdc75555"))