From b186599b6a693882d6307cf4d34122ecef782f02 Mon Sep 17 00:00:00 2001 From: Evan Niessen-Derry Date: Wed, 30 Mar 2022 12:20:01 -0500 Subject: [PATCH] Fix dependency injection at jack-in time Commit https://github.com/clojure-emacs/cider/commit/8989f40d in cider stopped using `cider-jack-in-lein-plugins` as a method for defining the dependencies to insert, which causes the sayid dependencies to be missed upon jack-in. Since we're using Cider anyways, and likely using it to define our nREPL version, we're going to leverage the more generic `cider-jack-in-dependencies` variable for defining the sayid dependency. To avoid potential version collisions, I've opted to no longer add the sayid plugin to the `cider-jack-in-lein-plugins` variable. --- src/el/sayid.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/el/sayid.el b/src/el/sayid.el index bcf7129..3d4321d 100644 --- a/src/el/sayid.el +++ b/src/el/sayid.el @@ -153,9 +153,9 @@ "Inject the REPL dependencies of sayid at `cider-jack-in'. If injecting the dependencies is not preferred set `sayid-inject-dependencies-at-jack-in' to nil." (when (and sayid-inject-dependencies-at-jack-in - (boundp 'cider-jack-in-lein-plugins) + (boundp 'cider-jack-in-dependencies) (boundp 'cider-jack-in-nrepl-middlewares)) - (add-to-list 'cider-jack-in-lein-plugins `("com.billpiel/sayid" ,sayid-injected-plugin-version)) + (add-to-list 'cider-jack-in-dependencies `("com.billpiel/sayid" ,sayid-injected-plugin-version)) (add-to-list 'cider-jack-in-nrepl-middlewares "com.billpiel.sayid.nrepl-middleware/wrap-sayid"))) ;;;###autoload