Fix continuing first line of explicit [/{ literal #5397
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
* Do not allow implicit call from first line of `[` array or `{` object
literal (as hinted at in comments).
* Support continuing an explicit `{` object literal when the first line
has an item on it.
Fixes jashkenas#5368
src/rewriter.coffee
Outdated
| @@ -183,6 +183,7 @@ exports.Rewriter = class Rewriter | |||
| [prevTag] = prevToken = if i > 0 then tokens[i - 1] else [] | |||
| [nextTag] = nextToken = if i < tokens.length - 1 then tokens[i + 1] else [] | |||
| stackTop = -> stack[stack.length - 1] | |||
| stackTop2 = -> stack[stack.length - 2] | |||
There was a problem hiding this comment.
A name like stackTop2 implies to me that it’s returning two elements, not that it’s referring to the second highest item in the stack. Maybe stackSecond?
Or maybe do without the helper function? It’s only called in one place, we could just put stack[stack.length - 2] there.
|
Thanks @GeoffreyBooth for the review! |
Merged
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 makes two changes to fix continuing a nonempty first line of an explicit
[array or{object literal:Do not allow implicit call with an implicit object body from first line of
[array or{object literal (as hinted at in comments, but not previously implemented), as in:Previously, these were treated as function calls where
xis a function.Support continuing an explicit
{object literal when the first line has an item on it, as in:{x: 1 y: 2 }Previously, this was treated as
{x: 1, {y: 2}}which was invalid.Fixes #5368