Skip to content

Fix #157: Highlight val with upper case #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

camilaagw
Copy link
Contributor

No description provided.

Copy link
Contributor

@MaximeKjaer MaximeKjaer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thank you for fixing this! It seems Travis CI is stuck and isn't scheduling the build, I'll try to see if I can restart it. Once that passes we can merge.

},
{
match: `\\b(?:(val)|(var))\\s+(?:(${backQuotedId}|${plainid})|(?=\\())`,
match: `\\b(?:(val)|(var))\\s+(?:(${idUpper}(\\s*,\\s*${idUpper})*|${backQuotedId}|${plainid})|(?=\\())`,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we can fix #153 with something like

          match: `\\b(?:(val)|(var))\\s+(?:((?:${idUpper}|${backQuotedId}|${plainid})(\\s*,\\s*(?:${idUpper}|${backQuotedId}|${plainid}))*)|(?=\\())`,

That can be done another PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect. I will take a look at it.

@nicolasstucki nicolasstucki merged commit ed085b9 into scala:master Dec 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants