Kotlin: Simplify regexes and name fixes #1326
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
Fix - Annotations, e.g. @deprecated or @`BacktickedAnnotation` For Name::Class locations, specifically match the class name regex, with a capital letter.
pyrmont
suggested changes
Sep 9, 2019
pyrmont
added
the
author-action
|
@lordcodes Thanks for all your help on the Kotlin lexer recently! I think this is a great improvement on the clarity of the code :) |
pyrmont
removed
the
author-action
|
@pyrmont Thank you. Happy to help! Great to see it cleaned up and so much more being highlighted! |
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.
Simplify the regex for matching names/identifiers in the Kotlin lexer.
Rather than having a regex for name with or without wrapped back-ticks, just have optional match for back-tick at start and end of the identifier.
Remove unnecessary id regex, when it just wrapped name into capture group.
Fix annotation matching, as it was surrounding the full name rule with @ and uppercase start. However, this meant it looked for back-ticks after the uppercase first character.
Locations that are matching for Name::Class token now look for class_name so expect capital first letter.
Remove @ from the name matcher, as there was already a separate rule to match annotations and marking them as Name::Decorator instead.
Fixes #1324
@pyrmont