Skip to content

Commit cb4df08

Browse files
vemvbbatsov
authored andcommitted
Undo breaking changes
1 parent 71c80f6 commit cb4df08

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

src-jdk8/orchard/java/legacy_parser.clj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@
275275
(first))
276276
;; relative path on the classpath
277277
:file path
278+
;; Legacy key. Please do not remove - we don't do breaking changes!
279+
:path (-> path io/resource .getPath)
278280
;; Full URL, e.g. file:.. or jar:...
279281
:resource-url (io/resource path))))
280282
(catch Abort _)))

src-newer-jdks/orchard/java/parser.clj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@
306306
(first))
307307
;; relative path on the classpath
308308
:file path
309+
;; Legacy key. Please do not remove - we don't do breaking changes!
310+
:path (-> path io/resource .getPath)
309311
;; Full URL, e.g. file:.. or jar:...
310312
:resource-url (io/resource path))
311313
(finally (.close (.getJavaFileManager root))))))

test/orchard/java_test.clj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,17 @@
8181
(deftest map-structure-test
8282
(when jdk-parser?
8383
(testing "Parsed map structure = reflected map structure"
84-
(let [cols #{:file :line :column :doc :argnames :argtypes :resource-url}
84+
(let [cols #{:file :line :column :doc :argnames :argtypes :path :resource-url}
8585
keys= #(= (set (keys (apply dissoc %1 cols)))
8686
(set (keys %2)))
8787
c1 (class-info* 'clojure.lang.Compiler)
8888
c2 (with-redefs [source-info (constantly nil)]
8989
(class-info* 'clojure.lang.Compiler))]
9090
;; Class info
91-
(is (keys= c1 c2) (str "Difference: "
92-
(pr-str [(remove (set (keys c1)) (keys c2))
93-
(remove (set (keys c2)) (keys c1))])))
91+
(is (keys= c1 c2)
92+
(str "Difference: "
93+
(pr-str [(remove (set (keys c1)) (keys c2))
94+
(remove (set (keys c2)) (keys c1))])))
9495
;; Members
9596
(is (keys (:members c1)))
9697
(is (= (keys (:members c1))

0 commit comments

Comments
 (0)