Fix #140: Identify nameless given declarations #144
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
nicolasstucki
force-pushed
the
fix-#140
branch
from
17e1664 to
d557cc4
Compare
MaximeKjaer
reviewed
Sep 8, 2020
src/typescript/Scala.tmLanguage.ts
Outdated
| @@ -708,7 +708,7 @@ export const scalaTmLanguage: TmLanguage = { | |||
| name: 'meta.package.scala' | |||
| }, | |||
| { | |||
| match: `\\b(given)\\b\\s*(?:\\b(as)\\b|(${idUpper})|(${backQuotedId}|(?!//|/\\*)${plainid})?)`, | |||
| match: `\\b(given)\\b\\s*(?:\\b(as)\\b|(${idUpper})(?=.+\\bas\\b)|(${backQuotedId}(?=.+\\bas\\b)|(?!//|/\\*)${plainid}(?=.+\\bas\\b))?)`, | |||
There was a problem hiding this comment.
.+ can be too greedy, and make the regex match just because there is an as later on the line (e.g. given foo = ???; given Bar as bar, where foo is highlighted incorrectly).
I dont think we need \b\s*, we can just use \s+, which also allows us to remove the \b before the first (as).
There was a problem hiding this comment.
I refactored it and added support for multiple given definitions in a single line.
nicolasstucki
force-pushed
the
fix-#140
branch
from
d557cc4 to
8c8dd67
Compare
nicolasstucki
force-pushed
the
fix-#140
branch
from
8c8dd67 to
bd9c1d9
Compare
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.
No description provided.