Fix highlighting comparable method definition #2149
Merged
+15
−1
Conversation
This file contains hidden or 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
Previously, when trying to highlight the definition of the comparable method (aka the spaceship, `<=>`), the `<` would be highlighted as `Name::Function` but the `=>` would be `Operator`. This happens because of the ordering of potential matches in the `funcname` regular expression: ```ruby %r( # snip <<? | >>? | <=>? # snip ) ``` The method name is always caught by the single `<` match, and so never makes it to the `<=>` possibility. This commit fixes the issue by trying to match `<=>?` before `<<?`. This ensures it _can_ be matched, and since none of the following potential matches are a superset of its (`<=>?`) matches it won't cause any issue with subsequent possibilities.
Collaborator
|
Thanks, @skipkayhil. LGTM. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Previously, when trying to highlight the definition of the comparable method (aka the spaceship,
<=>), the<would be highlighted asName::Functionbut the=>would beOperator. This happens because of the ordering of potential matches in thefuncnameregular expression:The method name is always caught by the single
<match, and so never makes it to the<=>possibility.This commit fixes the issue by trying to match
<=>?before<<?. This ensures it can be matched, and since none of the following potential matches are a superset of its (<=>?) matches it won't cause any issue with subsequent possibilities.