[trim] Fix trimming at end of raw block when specified in the opening tag #1717
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
samdoiron
reviewed
May 19, 2023
| @@ -26,6 +26,7 @@ def parse(tokens) | |||
| @body = +'' | |||
| while (token = tokens.shift) | |||
| if token =~ FullTokenPossiblyInvalid && block_delimiter == Regexp.last_match(2) | |||
| parse_context.trim_whitespace = (token[-3] == WhitespaceControl) | |||
There was a problem hiding this comment.
Do we always reset this in the next tag?
There was a problem hiding this comment.
We do when using block_body and encountering a {% ... token. I can't say for certain if all block tags use BlockBody, although it looks that way (except raw).
samdoiron
approved these changes
May 19, 2023
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.
The
rawtag doesn't useBlockBodyto parse its body. As a result, it currently doesn't respect nor reset the parsing context'strim_whitespacevalue.This PR makes it reset it at the end of the block, respecting either non-trimming (
endraw %}) or trimming (endraw -%}).This change is in line with Liquid::C's implementation.
It does not respect inner whitespace control, and
{% raw -%} inner {%- endraw %}will preserve the spaces. This is also in line with Liquid::C.