Allow yield indented object#5072
Merged
GeoffreyBooth merged 3 commits intojashkenas:masterfrom Jun 11, 2018
Merged
Conversation
GeoffreyBooth
requested changes
May 23, 2018
test/formatting.coffee
Outdated
|
|
||
| do -> | ||
| y = | ||
| if no then await |
Collaborator
There was a problem hiding this comment.
This needs to go in the async file, so that the tests pass in Node 6.
Collaborator
Author
There was a problem hiding this comment.
@GeoffreyBooth ok moved to test/async.coffee
src/grammar.coffee
Outdated
| o '+ Expression', (-> new Op '+', $2), prec: 'UNARY_MATH' | ||
|
|
||
| o 'AWAIT Expression', -> new Op $1 , $2 | ||
| o 'AWAIT INDENT Object OUTDENT', -> new Op $1 , $3 |
Collaborator
There was a problem hiding this comment.
Okay this is a total nit, but why is there a space before this comma? And on the previous line.
Collaborator
Author
There was a problem hiding this comment.
@GeoffreyBooth guessing the previous line was originally copied from eg the UNARY Expression line, which contains an extra space to align with following. Updated
GeoffreyBooth
approved these changes
Jun 4, 2018
Collaborator
|
Looks good to me. @zdenko or anyone else have any notes? |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #5054
Follows the same pattern as eg #4599 to allow
yieldto take an indented object