Ensure ns-query map is built correctly #618
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dpsutton
pushed a commit
to dpsutton/cider
that referenced
this pull request
Jun 23, 2019
Confluence of bugs in orchard, cider-nrepl, and CIDER. CIDER was using the wrong key to send excluded namespaces. cider-nrepl was not putting this key in the right position for the orchard query. And orchard was not correctly eliding cider.nrepl inlined deps. - orchard: clojure-emacs/orchard#59 - nrepl: clojure-emacs/cider-nrepl#618
6 tasks
dpsutton
force-pushed
the
apropos-var-query
branch
from
0e4e452
to
ea6a468
Compare
The required structure for the 'query/var' function is `{:var-query
{:ns-query {...}}`. The older implementation did not grab those
keywords from the cider message and put them at the correct
level. they were left top level and then missed by the
`query/namespace` function.
In addition to this, there was a bug in orchard which had the wrong
prefix for inlined deps so these were not omitted in _2_ places: both
in the client-side specification of which namespaces to ignore and
orchard's own mechanism to elide cider's internal namespaces.
See related:
- orchard clojure-emacs/orchard#59
- CIDER clojure-emacs/cider#2658
dpsutton
force-pushed
the
apropos-var-query
branch
from
ea6a468
to
99d6313
Compare
dpsutton
pushed a commit
to dpsutton/cider
that referenced
this pull request
Jun 23, 2019
Confluence of bugs in orchard, cider-nrepl, and CIDER. CIDER was using the wrong key to send excluded namespaces. cider-nrepl was not putting this key in the right position for the orchard query. And orchard was not correctly eliding cider.nrepl inlined deps. - orchard: clojure-emacs/orchard#59 - nrepl: clojure-emacs/cider-nrepl#618
bbatsov
pushed a commit
to clojure-emacs/cider
that referenced
this pull request
Jun 24, 2019
Confluence of bugs in orchard, cider-nrepl, and CIDER. CIDER was using the wrong key to send excluded namespaces. cider-nrepl was not putting this key in the right position for the orchard query. And orchard was not correctly eliding cider.nrepl inlined deps. - orchard: clojure-emacs/orchard#59 - nrepl: clojure-emacs/cider-nrepl#618
bbatsov
reviewed
Jun 24, 2019
| (let [msg {:exclude-regexps ["^cider.nrepl" "^refactor-nrepl" "^nrepl"] | ||
| :query "spelling"} | ||
| query-map (#'apropos/msg->var-query-map msg)] | ||
| (is (contains? (:var-query query-map) :ns-query)) |
There was a problem hiding this comment.
Won't it be better to just compare the result with the expected map?
There was a problem hiding this comment.
i thought about that but i think the returned map will have regex's rather than strings for the exclude-regexps and I wasn't sure of the semantics of comparing regexes
There was a problem hiding this comment.
and it appears they compare by reference. (= #"bob" #"bob") is false. so it would require some wrangling that i wasn't into at the time :) I can take another crack at it later if you like.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The required structure for the 'query/var' function is
{:var-query {:ns-query {...}}. The older implementation did not grab thosekeywords from the cider message and put them at the correct
level. they were left top level and then missed by the
query/namespacefunction.In addition to this, there was a bug in orchard which had the wrong
prefix for inlined deps so these were not omitted in 2 places: both
in the client-side specification of which namespaces to ignore and
orchard's own mechanism to elide cider's internal namespaces.
See related:
Before submitting a PR make sure the following things have been done:
Keep in mind that new cider-nrepl builds are automatically deployed to Clojars
once a PR is merged, but only if the CI build is green.
If you're just starting out to hack on cider-nrepl you might find
this article and the
"Design" section of the README extremely useful.
Thanks!