From ca90c5e83caa86e0a5adb098a8e7015555137e36 Mon Sep 17 00:00:00 2001 From: Ellis Kenyo Date: Sun, 19 Feb 2023 21:45:55 +0000 Subject: [PATCH] fix(clojure): improve how cljr is loaded --- modules/lang/clojure/config.el | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el index d51d830aa..af500700f 100644 --- a/modules/lang/clojure/config.el +++ b/modules/lang/clojure/config.el @@ -7,6 +7,8 @@ ;; it should have a lower threshold too. (add-to-list 'doom-large-file-size-alist '("\\.\\(?:clj[sc]?\\|dtm\\|edn\\)\\'" . 0.5)) +(defvar +clojure-load-clj-refactor-with-lsp nil + "Whether or not to include clj-refactor along with clojure-lsp.") ;; ;;; Packages @@ -248,16 +250,15 @@ (use-package! clj-refactor - :hook (clojure-mode . clj-refactor-mode) :config - (unless (modulep! +lsp) + (when (or (not (modulep! +lsp)) + +clojure-load-clj-refactor-with-lsp) + (add-hook 'clojure-mode-hook #'clj-refactor-mode) (set-lookup-handlers! 'clj-refactor-mode - :references #'cljr-find-usages)) - (when (modulep! +lsp) - (setq cljr-add-ns-to-blank-clj-files nil)) - (map! :map clojure-mode-map - :localleader - :desc "refactor" "R" #'hydra-cljr-help-menu/body)) + :references #'cljr-find-usages) + (map! :map clojure-mode-map + :localleader + :desc "refactor" "R" #'hydra-cljr-help-menu/body))) ;; clojure-lsp already uses clj-kondo under the hood