Skip to content

Commit cc458a4

Browse files
committed
Fix the build tool detection
1 parent 4ddac0e commit cc458a4

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

cider.el

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1345,11 +1345,11 @@ Use `cider-ps-running-nrepls-command' and `cider-ps-running-nrepl-path-regexp-li
13451345
"Identify build systems present by their build files in PROJECT-DIR.
13461346
PROJECT-DIR defaults to current project."
13471347
(let* ((default-directory (or project-dir (clojure-project-dir (cider-current-dir))))
1348-
(build-files '(("lein" . "project.clj")
1349-
("boot" . "build.boot")
1350-
("clojure-cli" . "deps.edn")
1351-
("shadow-cljs" . "shadow-cljs.edn")
1352-
("gradle" . "build.gradle"))))
1348+
(build-files '((lein . "project.clj")
1349+
(boot . "build.boot")
1350+
(clojure-cli . "deps.edn")
1351+
(shadow-cljs . "shadow-cljs.edn")
1352+
(gradle . "build.gradle"))))
13531353
(delq nil
13541354
(mapcar (lambda (candidate)
13551355
(when (file-exists-p (cdr candidate))

test/cider-tests.el

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
(setq-local cider-jack-in-dependencies-exclusions '()))
4949

5050
(it "can inject dependencies in a lein project"
51-
(expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
51+
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
5252
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.10.0-SNAPSHOT\\\"\\] -- repl :headless"))
5353

5454
(it "can inject dependencies in a lein project with an exclusion"
5555
(setq-local cider-jack-in-dependencies-exclusions '(("org.clojure/tools.nrepl" ("org.clojure/clojure"))))
56-
(expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
56+
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
5757
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\ \\:exclusions\\ \\[org.clojure/clojure\\]\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.10.0-SNAPSHOT\\\"\\] -- repl :headless"))
5858

5959
(it "can inject dependencies in a lein project with multiple exclusions"
6060
(setq-local cider-jack-in-dependencies-exclusions '(("org.clojure/tools.nrepl" ("org.clojure/clojure" "foo.bar/baz"))))
61-
(expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
61+
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
6262
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\ \\:exclusions\\ \\[org.clojure/clojure\\ foo.bar/baz\\]\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.10.0-SNAPSHOT\\\"\\] -- repl :headless"))
6363

6464
(it "can inject dependencies in a boot project"
@@ -75,7 +75,7 @@
7575
(setq-local cider-jack-in-nrepl-middlewares '("refactor-nrepl.middleware/wrap-refactor" "cider.nrepl/cider-middleware"))
7676
(setq-local cider-jack-in-dependencies-exclusions '()))
7777
(it "can inject dependencies in a lein project"
78-
(expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
78+
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
7979
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[refactor-nrepl\\ \\\"2.0.0\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.11.0\\\"\\] -- repl :headless"))
8080

8181
(it "can inject dependencies in a boot project"
@@ -89,7 +89,7 @@
8989
(setq-local cider-jack-in-lein-plugins '(("cider/cider-nrepl" "0.11.0")))
9090
(setq-local cider-jack-in-dependencies-exclusions '()))
9191
(it "can concat in a lein project"
92-
(expect (cider-inject-jack-in-dependencies "-o -U" "repl :headless" "lein")
92+
(expect (cider-inject-jack-in-dependencies "-o -U" "repl :headless" 'lein)
9393
:to-equal "-o -U update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.11.0\\\"\\] -- repl :headless"))
9494
(it "can concat in a boot project"
9595
(expect (cider-inject-jack-in-dependencies "-C -o" "repl -s wait" "boot")
@@ -147,7 +147,7 @@
147147
:and-return-value '(("refactor-nrepl" "2.0.0") ("cider/cider-nrepl" "0.11.0")))
148148
(setq-local cider-jack-in-dependencies-exclusions '()))
149149
(it "uses them in a lein project"
150-
(expect (cider-inject-jack-in-dependencies "" "repl :headless" "lein")
150+
(expect (cider-inject-jack-in-dependencies "" "repl :headless" 'lein)
151151
:to-equal "update-in :dependencies conj \\[org.clojure/tools.nrepl\\ \\\"0.2.12\\\"\\] -- update-in :plugins conj \\[refactor-nrepl\\ \\\"2.0.0\\\"\\] -- update-in :plugins conj \\[cider/cider-nrepl\\ \\\"0.11.0\\\"\\] -- repl :headless"))
152152
(it "uses them in a boot project"
153153
(expect (cider-inject-jack-in-dependencies "" "repl -s wait" "boot")
@@ -178,8 +178,8 @@
178178
(describe "when there is a single project"
179179
(it "returns that type"
180180
(spy-on 'cider--identify-buildtools-present
181-
:and-return-value '("lein"))
182-
(expect (cider-project-type) :to-equal "lein")))
181+
:and-return-value '(lein))
182+
(expect (cider-project-type) :to-equal 'lein)))
183183

184184
(describe "when there are multiple possible project types"
185185
(before-all

0 commit comments

Comments
 (0)