Skip to content

Commit f737eb6

Browse files
dan suttonbbatsov
authored andcommitted
Check for cemerick/piggieback and fall back to cider/piggieback
CIDER injects cider/piggieback automatically now while some users are still on cemerick/piggieback. The result is that this will always return true since cider/piggieback is on the classpath. Notably, shadow-cljs fakes a cemerick/piggieback and places the compiler environment there for cider-nrepl. But we see the injected cider/piggieback and so look for the cljs compiler environment there rather than in cemerick.
1 parent 2e7be20 commit f737eb6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/cider/nrepl/middleware/util/cljs.clj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
"Returns the path in the session map for the ClojureScript compiler
4242
environment used by piggieback."
4343
[]
44-
[(if cider-piggieback?
45-
(resolve 'cider.piggieback/*cljs-compiler-env*)
46-
(resolve 'cemerick.piggieback/*cljs-compiler-env*))])
44+
[(if cemerick-piggieback?
45+
(resolve 'cemerick.piggieback/*cljs-compiler-env*)
46+
(resolve 'cider.piggieback/*cljs-compiler-env*))])
4747

4848
(defn- maybe-deref
4949
[x]

0 commit comments

Comments
 (0)