[java] Don't delay loading parser-next namespace, move exception handling

Author: alexander-yakushev

src/orchard/java.clj

@@ -47,40 +47,19 @@
   (atom nil))
 
 (def ^:private parser-next-source-info
-  (delay
-    (when (>= misc/java-api-version 11)
-      (try (let [f (requiring-resolve 'orchard.java.parser-next/source-info)]
-             ;; We try parsing LruMap.java as a litmus test for whether the
-             ;; parser works. We can be sure that LruMap.java is on the
-             ;; classpath because we pack it into the final Orchard jar.
-             (when (f `LruMap)
-               f))
-           (catch Throwable e
-             (reset! parser-exception e)
-             nil)))))
+  (when (>= misc/java-api-version 11)
+    (requiring-resolve 'orchard.java.parser-next/source-info)))
 
 (defn source-info
   "Try to return class info from its parsed source if the source is available.
   Returns nil in case of any errors."
   ([class-symbol]
    ;; Arity for backward compatibility.
-   (try
-     (let [klass (resolve class-symbol)
-           url (some-> klass src-files/class->source-file-url)]
-       (when url
-         (source-info klass url)))
-     (catch Throwable e
-       (reset! parser-exception e)
-       (when (= (System/getProperty "orchard.internal.test-suite-running") "true")
-         (throw e)))))
+   (when parser-next-source-info
+     (parser-next-source-info class-symbol)))
   ([klass source-url]
-   (try
-     (when-let [f @parser-next-source-info]
-       (f klass source-url))
-     (catch Throwable e
-       (reset! parser-exception e)
-       (when (= (System/getProperty "orchard.internal.test-suite-running") "true")
-         (throw e))))))
+   (when parser-next-source-info
+     (parser-next-source-info klass source-url))))
 
 ;; As of Java 11, Javadoc URLs begin with the module name.
 (defn module-name
@@ -285,7 +264,8 @@
                                      :file-url source-file-url
                                      :resource relative-source-path})
                                   (when (and *analyze-sources* source-file-url)
-                                    (source-info c source-file-url))
+                                    (try (source-info c source-file-url)
+                                         (catch Exception _)))
                                   {:name       (-> c .getSimpleName symbol)
                                    :class      (-> c .getName symbol)
                                    :package    package

src/orchard/java/parser_next.clj

@@ -97,15 +97,14 @@
                           (getSupportedOptions [_this]
                             #{})))
         out      (StringWriter.)        ; discard compiler messages
-        opts     (apply conj ["--show-members" "private"
-                              "--show-types" "private"
-                              "--show-packages" "all"
-                              "--show-module-contents" "all"
-                              "-quiet"]
-                        (when module
-                          ["--patch-module" (str module "=" tmpdir)]))
-        slurped (slurp url)
-        _ (spit tmpfile slurped)
+        opts     (concat ["--show-members" "private"
+                          "--show-types" "private"
+                          "--show-packages" "all"
+                          "--show-module-contents" "all"
+                          "-quiet"]
+                         (when module
+                           ["--patch-module" (str module "=" tmpdir)]))
+        _ (spit tmpfile (slurp url))
         task (.getTask compiler out nil nil doclet opts sources)]
     (try
       (if (false? (.call ^DocumentationTool$DocumentationTask task))
@@ -428,7 +427,7 @@
   ([class-sym]
    ;; This arity is left for backward compatibility.
    (let [klass (resolve class-sym)
-         src-url (src-files/class->source-file-url klass)]
+         src-url (some-> klass src-files/class->source-file-url)]
      (when src-url
        (source-info klass src-url))))
   ([^Class klass, source-url]

test/orchard/info_test.clj

@@ -5,13 +5,10 @@
    [clojure.string :as string :refer [replace-first]]
    [clojure.test :refer [are deftest is testing use-fixtures]]
    [orchard.info :as info]
-   [orchard.java :as java]
    [orchard.misc :as misc]
    [orchard.test-ns]
    [orchard.test.util :as util]))
 
-(java/source-info 'mx.cider.orchard.LruMap) ;; make tests more deterministic
-
 (def cljs-available?
   (let [sym 'orchard.cljs.test-env
         fname (-> sym str (string/replace "." "/") (string/replace "-" "_") (str ".cljc"))]