Don't compute io/resource twice for :path

clojure-emacs · Nov 11, 2021 · 646af3e · 646af3e
1 parent 3e448d5
commit 646af3e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/src-jdk8/orchard/java/legacy_parser.clj b/src-jdk8/orchard/java/legacy_parser.clj
@@ -270,13 +270,14 @@
   (try
     (let [path (source-path klass)]
       (when-let [root (parse-java path)]
-        (assoc (->> (map parse-info (.classes root))
-                    (filter #(= klass (:class %)))
-                    (first))
-               ;; relative path on the classpath
-               :file path
-               ;; Legacy key. Please do not remove - we don't do breaking changes!
-               :path (-> path io/resource .getPath)
-               ;; Full URL, e.g. file:.. or jar:...
-               :resource-url (io/resource path))))
+        (let [path-resource (io/resource path)]
+          (assoc (->> (map parse-info (.classes root))
+                      (filter #(= klass (:class %)))
+                      (first))
+                 ;; relative path on the classpath
+                 :file path
+                 ;; Legacy key. Please do not remove - we don't do breaking changes!
+                 :path (.getPath path-resource)
+                 ;; Full URL, e.g. file:.. or jar:...
+                 :resource-url path-resource))))
     (catch Abort _)))
diff --git a/src-newer-jdks/orchard/java/parser.clj b/src-newer-jdks/orchard/java/parser.clj
@@ -296,19 +296,20 @@
     (when-let [path (source-path klass)]
       (when-let [^DocletEnvironment root (parse-java path (module-name klass))]
         (try
-          (assoc (->> (.getIncludedElements root)
-                      (filter #(#{ElementKind/CLASS
-                                  ElementKind/INTERFACE
-                                  ElementKind/ENUM}
-                                (.getKind ^Element %)))
-                      (map #(parse-info % root))
-                      (filter #(= klass (:class %)))
-                      (first))
-                 ;; relative path on the classpath
-                 :file path
-                 ;; Legacy key. Please do not remove - we don't do breaking changes!
-                 :path (-> path io/resource .getPath)
-                 ;; Full URL, e.g. file:.. or jar:...
-                 :resource-url (io/resource path))
+          (let [path-resource (io/resource path)]
+            (assoc (->> (.getIncludedElements root)
+                        (filter #(#{ElementKind/CLASS
+                                    ElementKind/INTERFACE
+                                    ElementKind/ENUM}
+                                  (.getKind ^Element %)))
+                        (map #(parse-info % root))
+                        (filter #(= klass (:class %)))
+                        (first))
+                   ;; relative path on the classpath
+                   :file path
+                   ;; Legacy key. Please do not remove - we don't do breaking changes!
+                   :path (.getPath path-resource)
+                   ;; Full URL, e.g. file:.. or jar:...
+                   :resource-url path-resource))
           (finally (.close (.getJavaFileManager root))))))
     (catch Throwable _)))