Skip to content

Commit 6b39773

Browse files
authored
[Fix #2980] Remove unnecessary quoting for jack-in middleware list (#2981)
This also fixes cider-jack-in for `'clojure-cli` not working on windows.
1 parent 78b9147 commit 6b39773

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cider.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ one used."
571571
(append dependencies cider-jack-in-lein-plugins))
572572
" "))
573573
(middleware (mapconcat
574-
(apply-partially #'format "\\\"%s\\\"")
574+
(apply-partially #'format "%s")
575575
(cider-jack-in-normalized-nrepl-middlewares)
576576
","))
577577
(main-opts (format "\"-m\" \"nrepl.cmdline\" \"--middleware\" \"[%s]\"" middleware)))

test/cider-tests.el

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@
301301
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
302302
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
303303
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
304-
" \"[\\\"cider.nrepl/cider-middleware\\\"]\"]}}}' -M:cider/nrepl")
304+
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:cider/nrepl")
305305
"")))
306306
(setq-local cider-allow-jack-in-without-project t)
307307
(setq-local cider-clojure-cli-command "clojure")
@@ -315,7 +315,7 @@
315315
(let ((expected (string-join '("clojure -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
316316
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
317317
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
318-
" \"[\\\"cider.nrepl/cider-middleware\\\"]\"]}}}' -M:dev:test:cider/nrepl")
318+
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:dev:test:cider/nrepl")
319319
"")))
320320
(setq-local cider-clojure-cli-aliases "-A:dev:test")
321321
(setq-local cider-allow-jack-in-without-project t)
@@ -329,7 +329,7 @@
329329
(let ((expected (string-join '("-Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
330330
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
331331
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
332-
" \"[\\\"cider.nrepl/cider-middleware\\\"]\"]}}}' -M:test:cider/nrepl")
332+
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
333333
""))
334334
(deps '(("nrepl/nrepl" "0.8.3"))))
335335
(let ((cider-clojure-cli-aliases "test"))
@@ -346,7 +346,7 @@
346346
(let ((expected (string-join '("-J-Djdk.attach.allowAttachSelf -Sdeps '{:deps {nrepl/nrepl {:mvn/version \"0.8.3\"} "
347347
"cider/cider-nrepl {:mvn/version \"0.25.7\"}} "
348348
":aliases {:cider/nrepl {:main-opts [\"-m\" \"nrepl.cmdline\" \"--middleware\""
349-
" \"[\\\"cider.nrepl/cider-middleware\\\"]\"]}}}' -M:test:cider/nrepl")
349+
" \"[cider.nrepl/cider-middleware]\"]}}}' -M:test:cider/nrepl")
350350
""))
351351
(deps '(("nrepl/nrepl" "0.8.3"))))
352352
(let ((cider-clojure-cli-aliases "test"))

0 commit comments

Comments
 (0)