xref: fix AOT function lookup (#147)

Co-authored-by: Lukas Domagala <[email protected]>

Author: Cyrik

src/orchard/xref.clj

@@ -57,13 +57,18 @@
   {:added "0.5"}
   [v]
   (when-let [^clojure.lang.AFn v (to-fn v)]
-    (let [f-class-name (-> v .getClass .getName)]
-      ;; this uses the implementation detail that the clojure compiler always
-      ;; prefixes names of lambdas with the name of its surrounding function class
-      (into #{} (comp (filter (fn [[k _v]] (clojure.string/includes? k f-class-name)))
-                      (map (fn [[_k value]] (.get ^java.lang.ref.Reference value)))
-                      (mapcat fn-deps-class))
-            class-cache))))
+    (let [f-class-name (-> v .getClass .getName)
+          ;; this uses the implementation detail that the clojure compiler always
+          ;; prefixes names of lambdas with the name of its surrounding function class
+          deps (into #{} (comp (filter (fn [[k _v]] (clojure.string/includes? k f-class-name)))
+                               (map (fn [[_k value]] (.get ^java.lang.ref.Reference value)))
+                               (mapcat fn-deps-class))
+                     class-cache)]
+      ;; if there's no deps the class is most likely AoT compiled,
+      ;; try to access it directly
+      (if (empty? deps)
+        (-> v .getClass fn-deps-class)
+        deps))))
 
 (defn fn-transitive-deps
   "Returns a set with all the functions invoked inside `v` or inside those functions.

test/orchard/xref_test.clj

@@ -24,7 +24,10 @@
   (testing "with a symbol"
     (is (= (xref/fn-deps 'orchard.xref-test/dummy-fn)
            #{#'clojure.core/map #'clojure.core/filter
-             #'clojure.core/even? #'clojure.core/range #'orchard.xref-test/fn-dep}))))
+             #'clojure.core/even? #'clojure.core/range #'orchard.xref-test/fn-dep})))
+  (testing "AoT compiled functions return deps"
+    (is (= #{#'clojure.core/conj}
+           (xref/fn-deps reverse)))))
 
 ;; The mere presence of this var can reproduce a certain issue. See:
 ;; https://github.com/clojure-emacs/orchard/issues/135#issuecomment-939731698
@@ -52,8 +55,12 @@
   (testing "basics"
     (let [expected #{#'orchard.xref-test/fn-deps-test #'orchard.xref-test/fn-dep #'clojure.core/even?
                      #'clojure.core/filter #'orchard.xref-test/fn-transitive-dep #'clojure.core/map
-                     #'clojure.test/test-var #'clojure.core/range}]
+                     #'clojure.test/test-var #'clojure.core/range #'clojure.core/inc'}]
       (is (contains? expected #'orchard.xref-test/fn-transitive-dep)
           "Specifically includes `#'fn-transitive-dep`, which is a transitive dep of `#'dummy-fn` (via `#'fn-dep`)")
+      (is (contains? expected #'clojure.core/inc')
+          "Specifically includes `#'clojure.core/inc'`, which is a transitive dep of `#'dummy-fn` 
+           (via `#'clojure.core/range'`). Unlike other AoT compiled core transitive dependancies 
+           it gets found because its a non `:static` dependancy.")
       (is (= expected
              (xref/fn-transitive-deps dummy-fn))))))