Implement lstripBlocks and trimBlocks from Jinja2 #355
Conversation
|
Thanks for this. Only briefly looked at the code, does this handle windows-style line breaks too \r\n? |
| @@ -1103,7 +1103,7 @@ var Compiler = Object.extend({ | |||
| // console.log(tmpl); | |||
|
|
|||
| module.exports = { | |||
| compile: function(src, asyncFilters, extensions, name, lexerTags) { | |||
| compile: function(src, asyncFilters, extensions, name, lexerTags, trimBlocks, lstripBlocks) { | |||
There was a problem hiding this comment.
I think we should rethink this, the number of parameters being passed here is a lot.
There was a problem hiding this comment.
We can pass env instead of lexerTags, trimBlocks, lstripBlocks
There was a problem hiding this comment.
So, should I pass environment to lexer?
There was a problem hiding this comment.
Let's pass around a options object instead. If you can, move all the arguments after src into an options argument and us it like opts.trimBlocks. I think it would be fine to pass this same options argument to the parser and lexer as well.
There was a problem hiding this comment.
Problem is that path is not from opts and it's fourth argument. So either asyncFilters and extensions should be left where they are now. Or we break backwards compatibility.
There was a problem hiding this comment.
Don't care about breaking backwards compatibility as this will be going in nunjucks 2.0
|
No, this doesn't support windows-style line breaks, but Jinja2 doesn't support them too: |
|
Thanks for doing this, it looks good. |
|
I've moved some Environment options to opts, but left filters, asyncFilters, extensions as is — they are mutable by Environment. |
|
Thanks, I like how this looks. I'd say we go ahead and merge it and if we really want to support windows we can do that in the future. |
Implement lstripBlocks and trimBlocks from Jinja2
|
Will you be supporting windows-style line breaks? This issue had me confused for quite some time.. |
|
@magnusjt I'm not aware of anyone currently planning to implement support for Windows-style line breaks. I'd be happy to look at a pull request. |
This pull request implements functionality from Jinja2 trim_blocks and lstrip_blocks (renaming to camelCase).
It can significantly reduce amount of whitespace in the output if a lot of block tags are used.