Skip to content

Commit 0449bf8

Browse files
authored
[Fix #2993] Eval require and in-ns separately in cider-repl-set-ns (#2994)
Turns out `require` and `in-ns` are special forms in ClojureScript and they can't be combined in a `do`.
1 parent 15eaf42 commit 0449bf8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
### Bugs fixed
1010

11+
* [#2993](https://github.com/clojure-emacs/cider/issues/2993): Fix bug where calling `cider-repl-set-ns` for a cljs ns when `cider-repl-require-ns-on-set` is `t` would fail
1112
* [#2983](https://github.com/clojure-emacs/cider/issues/2983): update signal description in nrepl server sentinel as a workaround for emacs bug #46284 affecting v27.1 on windows
1213
* [#2941](https://github.com/clojure-emacs/cider/issues/2941): Use main args in alias for clojure cli
1314
* [#2953](https://github.com/clojure-emacs/cider/issues/2953): Don't font-lock function/macro vars as vars.

cider-repl.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,9 +1207,9 @@ command will prompt for the name of the namespace to switch to."
12071207
(user-error "No namespace selected"))
12081208
(cider-map-repls :auto
12091209
(lambda (connection)
1210-
(cider-nrepl-request:eval (if cider-repl-require-ns-on-set
1211-
(format "(do (require '%s) (in-ns '%s))" ns ns)
1212-
(format "(in-ns '%s)" ns))
1210+
(when cider-repl-require-ns-on-set
1211+
(cider-nrepl-sync-request:eval (format "(require '%s)" ns) connection))
1212+
(cider-nrepl-request:eval (format "(in-ns '%s)" ns)
12131213
(cider-repl-switch-ns-handler connection)))))
12141214

12151215

0 commit comments

Comments
 (0)