Proper Lambda Support #358
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
| " Matches a single keyword argument with no parens | ||
| syntax match jsArrowFuncArgs /\(\k\)\+\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend | ||
| " Matches a series of arguments surrounded in parens | ||
| syntax match jsArrowFuncArgs /(\(\k\|,\|\s\|\n\|\.\)*)\s\+\(=>\)\@=/ skipwhite contains=jsFuncArgs extend |
There was a problem hiding this comment.
Could you explain these two patterns?
There was a problem hiding this comment.
This is used to match the arguments definition for an => function.
Currently for normal functions we actually highlight the parenthesis and actual arguments definitions, see this example:
My color theme makes them orange.
To match this for lambdas, it's a bit trickier. We have to use a lookahead to match against the =>.
I separated it into 2 lines to make the overall regexes easier to understand.
Lambda functions can be both defined like this:
// The first of the syntax match lines matches this case
arg => obj.getter();And like this:
// The second syntax match line matches for this
(arg) => obj.getter()There was a problem hiding this comment.
\k is for a keyword character, :help \\k for more deets
|
LGTM |
Tacking this on since it relates to ES6 functions. The generator astericks were breaking the highlighting of function arguments. This should fix generators
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.
This PR is a first pass at properly supporting ES6 lambdas. Currently we only support the
=>(arrow) itself, and don't actually recognize the rest as a function declaration.This first pass should handle the majority of use cases, although there may be some scenarios I missed.
For reference, this is what syntax highlighting looked like prior to this PR:
And this is how it looks with this PR applied:
I also fixed a bug when defining a generator that would break
jsFuncArgshighlighting