Support whitespace control in comment blocks, close #332 #632
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
| ((nextToken.type === lexer.TOKEN_BLOCK_START && | ||
| nextVal.charAt(nextVal.length - 1) === '-') || | ||
| (nextToken.type === lexer.TOKEN_COMMENT && | ||
| nextVal.charAt(this.tokens.tags.COMMENT_START.length) |
There was a problem hiding this comment.
Why did you choose to use this.tokens.tags.COMMENT_START.length here instead of nextVal.length - 1 as used in the existing clause?
There was a problem hiding this comment.
Because the TOKEN_COMMENT contains COMMENT_START and COMMENT_END. It's a whole token so that the nextVal here is not {%{#.
Maybe breaking the TOKEN_COMMENT into three parts would be better. But It need change more code so that I use the tag instead.
|
Looks good, thanks! I had one question in review, but I don't need an answer before merging. And yes, I would prefer to match Jinja in supporting whitespace control for variable substitutions as well. |
carljm
added a commit
that referenced
this pull request
Jan 13, 2016
Support whitespace control in comment blocks, close #332
carljm
added a commit
that referenced
this pull request
Jan 14, 2016
Support whitespace control in comment blocks, close #332
|
Matching jinja would be nice 👍 . |
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.
Seems like jingja2 also supports whitespace control in variable blocks. Should nunjucks support that too?
trimBlocksandlstripBlocksonly works in statement blocks({% %}). Maybe They also should be supported in other blocks.