Skip to content

Commit 0cc5cc1

Browse files
committed
Fix cljr environment and add test
1 parent 94984d2 commit 0cc5cc1

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/main/clojure/clojure/tools/namespace/file.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
(def ^{:added "0.3.0"}
4949
clojure-clr-extensions
5050
"File extensions for Clojure (CLR) files."
51-
(list ".cljr" ".cljc"))
51+
(list ".cljr" ".cljc" ".clj" ))
5252

5353
(defn clojure-file?
5454
"Returns true if the java.io.File represents a file which will be

src/test/clojure/clojure/tools/namespace/find_test.clj

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,17 @@
3737
headless-clj (help/create-headless-source dir 'example.headless :clj)]
3838
(is (every? #{(.Name ^System.IO.DirectoryInfo dir)} ;; .getName ^java.io.File
3939
(map #(-> % second meta :dir)
40-
(find/find-ns-decls [dir]))))))
40+
(find/find-ns-decls [dir]))))))
41+
42+
;;; DM: added
43+
(deftest t-find-cljr-and-cljc-files
44+
"main.cljr depends on one.cljc which depends on two.cljr.
45+
two.clj also exists but should not be returned"
46+
(let [dir (help/create-temp-dir "t-find-cljr-and-cljc-files")
47+
main-cljr (help/create-source dir 'example.main :cljr '[example.one])
48+
one-cljc (help/create-source dir 'example.one :cljc '[example.two])
49+
two-cljs (help/create-source dir 'example.two :cljs)
50+
two-cljr (help/create-source dir 'example.two :cljr)]
51+
(is (help/same-files?
52+
[main-cljr one-cljc two-cljr]
53+
(find/find-sources-in-dir dir find/cljr)))))

0 commit comments

Comments
 (0)