Resolve :paths defined as aliases

See clojure-emacs/cider#3581
clojure-emacs · Nov 13, 2023 · 5bedde4 · 5bedde4
1 parent 92bc201
commit 5bedde4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/tools.deps/src/cider/enrich_classpath/clojure.clj b/tools.deps/src/cider/enrich_classpath/clojure.clj
@@ -110,6 +110,12 @@
                                    mv))
                          libs)
         paths (into paths extra-paths)
+        paths (into []
+                    (mapcat (fn [path]
+                              (if (keyword? path)
+                                (get-in basis [:aliases path] path)
+                                (vector path))))
+                    paths)
         original-paths-set (set paths)
         original-deps-set (->> original-deps (map first) set)
         shortened-jar-signature (string/join File/separator

diff --git a/tools.deps/test-resources/path-aliases/deps.edn b/tools.deps/test-resources/path-aliases/deps.edn
@@ -0,0 +1,5 @@
+{:paths [:clj-paths]
+ :deps {}
+ :aliases {:clj-paths ["the-main-source-path"]
+           :cljs-paths ["the-other-source-path"]
+           :cljc-paths {:extra-paths [:cljs-paths]}}}
diff --git a/tools.deps/test/integration/cider/enrich_classpath/clojure.clj b/tools.deps/test/integration/cider/enrich_classpath/clojure.clj
@@ -151,6 +151,22 @@
     (is (string/includes? cp "-e \"(println \\\"foo\\\")\"")
         "Escapes the -e value")))
 
+(deftest path-aliases
+  (let [cp (sut/impl "clojure"
+                     "deps.edn"
+                     (str (io/file (System/getProperty "user.dir") "test-resources" "path-aliases"))
+                     []
+                     true)]
+    (is (string/includes? cp "the-main-source-path")
+        "Resolves `:paths` defined as aliases"))
+  (let [cp (sut/impl "clojure"
+                     "deps.edn"
+                     (str (io/file (System/getProperty "user.dir") "test-resources" "path-aliases"))
+                     ["-A:cljc-paths"]
+                     true)]
+    (is (string/includes? cp "the-main-source-path:the-other-source-path")
+        "CLI aliases can use `:paths` aliases too")))
+
 (when-not (jdk/jdk8?)
   (deftest jvm-opts
     (testing "https://github.com/clojure-emacs/enrich-classpath/issues/56"