Skip to content

Commit d7f0617

Browse files
[info] Don't parse fn--123 lambdas as jumpable locations
1 parent ed440b0 commit d7f0617

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

src/orchard/meta.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
[_ wo-method] (re-matches #"(.+?)(?:\.(?:invoke|invokeStatic|doInvoke))?"
133133
demunged)
134134
[ns-str name-str] (->> (str/split wo-method #"/")
135-
(remove #(re-matches #"eval\d+" %)))
135+
(remove #(re-matches #"fn|eval\d+" %)))
136136
ns (some-> ns-str symbol find-ns)
137137
resolved (when (and ns name-str)
138138
(ns-resolve ns (symbol name-str)))]

test/orchard/info_test.clj

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,18 +196,14 @@
196196
(closed-over)
197197

198198
(deftest info-munged-printed-var-test
199-
(is (= 'str
200-
(:name (info/info 'orchard.test-ns 'clojure.core$str))))
201-
(is (= 'str
202-
(:name (info/info 'orchard.test-ns 'clojure.core$str.invoke))))
203-
(is (= 'str
204-
(:name (info/info 'orchard.test-ns 'clojure.core$str$fn__12.doInvoke))))
205-
(is (= 'str
206-
(:name (info/info 'orchard.test-ns (symbol "clojure.core/str/fn--12")))))
207-
(is (= 'closed-over
208-
(:name (info/info 'orchard.test-ns 'orchard.info_test$eval17939$closed_over__17940.invokeStatic))))
209-
(is (= 'closed-over
210-
(:name (info/info 'orchard.test-ns (symbol "orchard.info-test/eval17939/closed_over--17940"))))))
199+
(are [input result] (= result (:name (info/info 'orchard.test-ns input)))
200+
'clojure.core$str 'str
201+
'clojure.core$str.invoke 'str
202+
'clojure.core$str$fn__12.doInvoke 'str
203+
(symbol "clojure.core/str/fn--12") 'str
204+
'orchard.info_test$eval17939$closed_over__17940.invokeStatic 'closed-over
205+
(symbol "orchard.info-test/eval17939/closed_over--17940") 'closed-over
206+
(symbol "orchard.info/eval123456/fn__123.invoke") nil))
211207

212208
(deftest info-unqualified-sym-and-namespace-test
213209
(testing "Resolution from current namespace"

0 commit comments

Comments
 (0)