Fix #133: Highlight inline as a soft keyword #138
Merged
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
MaximeKjaer
reviewed
Aug 22, 2020
nicolasstucki
force-pushed
the
fix-#133
branch
from
4743b60 to
bcd5c48
Compare
MaximeKjaer
suggested changes
Sep 8, 2020
src/typescript/Scala.tmLanguage.ts
Outdated
| inline: { | ||
| patterns: [ | ||
| { | ||
| match: `\\b(inline)\\b(?=(\\s+(?:${plainid}|${backQuotedId})\\s*:)|(.*(val|def|given)))`, |
There was a problem hiding this comment.
I think the .* is a little bit dangerous, as it can be overly greedy in some instances, and match as long as there is a val somewhere else on the line. For instance:
inline if (n == 0) 1 else 2; val x = 2is highlighted as:
Normally, the inline should be highlighted in the same color as the if. I think \s+ could work instead of .* (and we could then remove the \b as we're matching on \s+ anyway).
There was a problem hiding this comment.
I rewrote it and added tests for this case
If it is part of an inline `if` or `match` it is highlighted as a control flow keyword. If it is part of a `def` or `val` definition it is highlighted as a declaration keyword. Otherwise, it is not highlighted.
nicolasstucki
force-pushed
the
fix-#133
branch
from
393291a to
3b2d1a8
Compare
nicolasstucki
force-pushed
the
fix-#133
branch
from
3b2d1a8 to
5b3c402
Compare
MaximeKjaer
approved these changes
Sep 9, 2020
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.
If it is part of an inline
iformatchit is highlighted as a control flow keyword.If it is part of a
deforvaldefinition it is highlighted as a declaration keyword.Otherwise, it is not highlighted.