File tree Expand file tree Collapse file tree 3 files changed +18
-7
lines changed Expand file tree Collapse file tree 3 files changed +18
-7
lines changed Original file line number Diff line number Diff line change 4
4
5
5
### Bugs fixed
6
6
7
- * Fix a NullPointerException in ` orchard.cljs.analysis ` .
7
+ * Fix a NullPointerException in ` orchard.cljs.analysis ` .
8
+ * Fix a ` Cannot open <nil> as a Reader ` .
8
9
9
10
## 0.9.0 (2022-01-10)
10
11
Original file line number Diff line number Diff line change 103
103
; ; These methods search sources on the classpath. Non-classpath source
104
104
; ; files, documentation code, etc within the project directory are ignored.
105
105
106
+ (defn jvm-clojure-resource-name->ns-name
107
+ " Given a .clj or .clj `resource-name`, returns its namespace name."
108
+ [resource-name]
109
+ (when (misc/clj-file? resource-name)
110
+ (some-> resource-name
111
+ io/resource ; ; can return nil for Emacs backup files, for example
112
+ read-namespace)))
113
+
106
114
(defn classpath-namespaces
107
115
" Returns all namespaces defined in sources on the classpath or the specified
108
116
classpath URLs."
109
117
([classpath-urls]
110
118
(->> classpath-urls
111
119
(pmap cp/classpath-seq)
112
120
(apply concat)
113
- (pmap (fn [x]
114
- (when (misc/clj-file? x)
115
- x)))
116
- (filter identity)
117
- (pmap (comp read-namespace io/resource))
121
+ (pmap jvm-clojure-resource-name->ns-name)
118
122
(filter identity)
119
123
(sort )))
120
124
([]
Original file line number Diff line number Diff line change 2
2
(:require
3
3
[clojure.java.io :as io]
4
4
[clojure.string :as str]
5
- [clojure.test :refer [deftest is testing]]
5
+ [clojure.test :refer [are deftest is testing]]
6
6
[orchard.misc :as misc]
7
7
[orchard.namespace :as sut]))
8
8
86
86
(is (= nses (map (comp sut/read-namespace ; src -> ns
87
87
sut/canonical-source) ; ns -> src
88
88
nses)))))))
89
+
90
+ (deftest jvm-clojure-resource-name->ns-name
91
+ (are [input expected] (= expected
92
+ (sut/jvm-clojure-resource-name->ns-name input))
93
+ " orchard/namespace_test.clj" 'orchard.namespace-test
94
+ " orchard/namespace_teeest.clj" nil ))
You can’t perform that action at this time.
0 commit comments