Ruby: support for fully qualified constants #248
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
jacktasia
reviewed
Dec 21, 2018
dumb-jump.el
Outdated
| @@ -1751,7 +1751,7 @@ to keep looking for another root." | |||
| (cond | |||
| ((and (string= lang "clojure") (s-contains? "/" look-for)) | |||
| (nth 1 (s-split "/" look-for))) | |||
| ((and (or (string= lang "ruby") (string= lang "crystal")) (s-starts-with? ":" look-for)) | |||
| ((and (or (string= lang "ruby") (string= lang "crystal")) (and (s-starts-with? ":" look-for) (and (not (s-starts-with? "::" look-for))))) | |||
There was a problem hiding this comment.
The second and here is unnecessary. That said, now that I understand the issue you're fixing I am pretty sure we don't need to actually add anything and we can simply swap the conditional blocks so it looks like this:
((and (string= lang "ruby") (s-contains? "::" look-for))
(-last-item (s-split "::" look-for)))
((and (or (string= lang "ruby") (string= lang "crystal")) (s-starts-with? ":" look-for))
(s-chop-prefix ":" look-for))
Does that seem right to you?
There was a problem hiding this comment.
Yup @jacktasia that works. I've reverted my changes and re-ordered the code and have left the test case in. Thanks!
|
Thanks for the PR and report! I made one small comment. |
|
Thanks! |
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.
Adds support for fully qualified constants like "::Foo". Currently dumb-jump peeks at the first character of the symbol to see if it starts with a colon and thus is a ruby symbol, then strips the colon. This patch checks to see if the symbol starts with two colons and, if so, doesn't strip the colon.