fix(clojure): load against the correct package

The cider library is loaded too late for clojure-mode to rely on, so we
load after the cider-mode package instead.

Fix: #7130
This commit is contained in:
Ellis Kenyo 2023-03-11 10:23:57 +00:00 committed by Henrik Lissner
parent b66ad77031
commit 9d6a7b7d4b

View file

@ -39,7 +39,10 @@
#'tree-sitter!))) #'tree-sitter!)))
(use-package! cider ;; `cider-mode' is used instead of the typical `cider' package due to the main
;; library being loaded only when is absolutely needed, which is too late for
;; our purposes
(use-package! cider-mode
;; NOTE if `org-directory' 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) :hook (clojure-mode-local-vars . cider-mode)
:init :init
@ -175,8 +178,6 @@
"C" #'cider-connect-cljs "C" #'cider-connect-cljs
"m" #'cider-macroexpand-1 "m" #'cider-macroexpand-1
"M" #'cider-macroexpand-all "M" #'cider-macroexpand-all
"j" #'jet
"f" #'neil-find-clojure-package
(:prefix ("d" . "debug") (:prefix ("d" . "debug")
"d" #'cider-debug-defun-at-point) "d" #'cider-debug-defun-at-point)
(:prefix ("e" . "eval") (:prefix ("e" . "eval")
@ -274,8 +275,15 @@
:commands (neil-find-clojure-package) :commands (neil-find-clojure-package)
:config :config
(setq neil-prompt-for-version-p nil (setq neil-prompt-for-version-p nil
neil-inject-dep-to-project-p t)) neil-inject-dep-to-project-p t)
(map! :map (clojure-mode-map clojurescript-mode-map clojurec-mode-map)
:localleader
"f" #'neil-find-clojure-package))
(use-package! jet (use-package! jet
:commands (jet)) :commands (jet)
:config
(map! :map (clojure-mode-map clojurescript-mode-map clojurec-mode-map)
:localleader
"j" #'jet))