Skip to content

Fix problematic double var lookup in xref/fn-refs+fn-deps #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 18, 2021
Merged

Fix problematic double var lookup in xref/fn-refs+fn-deps #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## master (unreleased)

* [#135](https://github.com/clojure-emacs/orchard/issues/135): Fix problematic double var lookup in `orchard.xref/fn-refs`

## 0.7.3 (2021-10-02)

### Changes
Expand Down
3 changes: 1 addition & 2 deletions src/orchard/xref.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,5 @@
[var]
(let [var (as-var var)
all-vars (q/vars {:ns-query {:project? true} :private? true})
all-vals (map var-get all-vars)
deps-map (zipmap all-vars (map fn-deps all-vals))]
deps-map (zipmap all-vars (map fn-deps all-vars))]
(map first (filter (fn [[_k v]] (contains? v var)) deps-map))))
9 changes: 9 additions & 0 deletions test/orchard/xref_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@
#{#'clojure.core/map #'clojure.core/filter
#'clojure.core/even? #'clojure.core/range}))))

;; The mere presence of this var can reproduce a certain issue. See:
;; https://github.com/clojure-emacs/orchard/issues/135#issuecomment-939731698
(def xxx 'foo/bar)

;; Like the above, but programmatic, to ensure that we the presence of a .clj file named `foo`
;; won't cause a false negative:
(def yyy (symbol (str (gensym))
(str (gensym))))

(deftest fn-refs-test
(testing "with a fn value"
(is (= (xref/fn-refs dummy-fn) '()))
Expand Down