Skip to content

Commit fde37a3

Browse files
[Fix #2916] Move Clojure-cli parameter global-opts after -Sdeps (#2917)
Move the aliases (global-opts) after the -Sdeps dependencies in cider-jack-in to match the order of arguments to the clojure command line tool.
1 parent 8ee6dcc commit fde37a3

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
@@ -9,6 +9,7 @@
99
### Bugs fixed
1010

1111
* Fix broken links to the docs in REPL warnings (the REPL links included the full CIDER version, but the docs URLs are without the patch version).
12+
* Fix ordering of dependencies, global-opts and params for Clojure CLI projects when calling cider-jack-in. Thanks to @iarenaza Resolves #2916
1213

1314
### Changes
1415

cider.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -564,16 +564,16 @@ removed, LEIN-PLUGINS, and finally PARAMS."
564564

565565
(defun cider-clojure-cli-jack-in-dependencies (global-opts params dependencies)
566566
"Create Clojure tools.deps jack-in dependencies.
567-
Does so by concatenating GLOBAL-OPTS, DEPENDENCIES finally PARAMS."
567+
Does so by concatenating DEPENDENCIES, GLOBAL-OPTS and PARAMS."
568568
(let ((dependencies (append dependencies cider-jack-in-lein-plugins)))
569569
(concat
570-
global-opts
571-
(unless (seq-empty-p global-opts) " ")
572570
"-Sdeps '{:deps {"
573571
(mapconcat #'identity
574572
(seq-map (lambda (dep) (format "%s {:mvn/version \"%s\"}" (car dep) (cadr dep))) dependencies)
575573
" ")
576574
"}}' "
575+
global-opts
576+
(unless (seq-empty-p global-opts) " ")
577577
params)))
578578

579579
(defun cider-shadow-cljs-jack-in-dependencies (global-opts params dependencies)

0 commit comments

Comments
 (0)