fix(clojure): improve how cljr is loaded

This commit is contained in:
Ellis Kenyo 2023-02-19 21:45:55 +00:00 committed by Henrik Lissner
parent 7a27409e30
commit ca90c5e83c

View file

@ -7,6 +7,8 @@
;; it should have a lower threshold too. ;; it should have a lower threshold too.
(add-to-list 'doom-large-file-size-alist '("\\.\\(?:clj[sc]?\\|dtm\\|edn\\)\\'" . 0.5)) (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 ;;; Packages
@ -248,16 +250,15 @@
(use-package! clj-refactor (use-package! clj-refactor
:hook (clojure-mode . clj-refactor-mode)
:config :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 (set-lookup-handlers! 'clj-refactor-mode
:references #'cljr-find-usages)) :references #'cljr-find-usages)
(when (modulep! +lsp) (map! :map clojure-mode-map
(setq cljr-add-ns-to-blank-clj-files nil)) :localleader
(map! :map clojure-mode-map :desc "refactor" "R" #'hydra-cljr-help-menu/body)))
:localleader
:desc "refactor" "R" #'hydra-cljr-help-menu/body))
;; clojure-lsp already uses clj-kondo under the hood ;; clojure-lsp already uses clj-kondo under the hood