[info] Recognize Clojure vars printed as munged classes and methods

Author: alexander-yakushev

src/orchard/info.clj

@@ -63,6 +63,8 @@
      (m/special-sym-meta sym)
      ;; it's a var
      (some-> ns (m/resolve-var sym) (m/var-meta var-meta-allowlist))
+     ;; it's a munged printed var or .invoke method of a Clojure function
+     (some-> (m/resolve-munged-printed-var sym) (m/var-meta var-meta-allowlist))
      ;; it's a Java class/constructor/member symbol
      (some-> ns (java/resolve-symbol sym))
      ;; it's an alias for another ns

src/orchard/meta.clj

@@ -11,7 +11,7 @@
    [orchard.namespace :as ns]
    [orchard.spec :as spec])
   (:import
-   (clojure.lang LineNumberingPushbackReader Namespace Var)))
+   (clojure.lang Compiler LineNumberingPushbackReader Namespace Var)))
 
 ;;; ## Extractors
 
@@ -119,6 +119,26 @@
   (when-let [ns (find-ns ns)]
     (ns-aliases ns)))
 
+(defn resolve-munged-printed-var
+  "Given a printed munged representation of Clojure function, try to resolve it as
+  a var. Supports the following representations:
+  - clojure.core$str
+  - clojure.core$str.invoke
+  - clojure.main$repl$fn__9119.invoke (resolves to named var, not internal lambda)
+  - some.ns$eval1234$closing_over_fn__12345.invoke"
+  [sym]
+  (let [demunged (-> (Compiler/demunge (str sym))
+                     (string/replace #"--\d+" ""))
+        [_ wo-method] (re-matches #"(.+?)(?:\.(?:invoke|invokeStatic|doInvoke))?"
+                                  demunged)
+        [ns-str name-str] (->> (string/split wo-method #"/")
+                               (remove #(re-matches #"eval\d+" %)))
+        ns (some-> ns-str symbol find-ns)
+        resolved (when (and ns name-str)
+                   (ns-resolve ns (symbol name-str)))]
+    (when (var? resolved)
+      resolved)))
+
 ;; Even if things like catch or finally aren't clojure special
 ;; symbols we want to be able to talk about them.
 ;; They just map to a special symbol.

test/orchard/info_test.clj

@@ -191,6 +191,24 @@
                             (select-keys [:ns :name :arglists :doc])
                             (update :ns ns-name))))))))
 
+(let [a 1]
+  (defn- closed-over [] a))
+(closed-over)
+
+(deftest info-munged-printed-var-test
+  (is (= 'str
+         (:name (info/info 'orchard.test-ns 'clojure.core$str))))
+  (is (= 'str
+         (:name (info/info 'orchard.test-ns 'clojure.core$str.invoke))))
+  (is (= 'str
+         (:name (info/info 'orchard.test-ns 'clojure.core$str$fn__12.doInvoke))))
+  (is (= 'str
+         (:name (info/info 'orchard.test-ns (symbol "clojure.core/str/fn--12")))))
+  (is (= 'closed-over
+         (:name (info/info 'orchard.test-ns 'orchard.info_test$eval17939$closed_over__17940.invokeStatic))))
+  (is (= 'closed-over
+         (:name (info/info 'orchard.test-ns (symbol "orchard.info-test/eval17939/closed_over--17940"))))))
+
 (deftest info-unqualified-sym-and-namespace-test
   (testing "Resolution from current namespace"
     (when cljs-available?
@@ -410,13 +428,13 @@
 
       (when cljs-available?
         (testing "- :cljs"
-          (is (= (take 3 (repeat expected))
+          (is (= (repeat 3 expected)
                  (->> params
                       (map #(info/info* (merge @*cljs-params* %)))
                       (map #(select-keys % [:ns :name :arglists :macro :file])))))))
 
       (testing "- :clj"
-        (is (= [{}, expected, {}]
+        (is (= (repeat 3 expected)
                (->> params
                     (map #(info/info* %))
                     (map #(select-keys % [:ns :name :arglists :macro :file])))))))))