Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't reset Liquid tag's whitespace control from comment tag #1773

Merged
merged 1 commit into from
Jan 5, 2024
Merged

don't reset Liquid tag's whitespace control from comment tag #1773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/liquid/tags/comment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ def parse_body(body, tokenizer)
comment_tag_depth += 1
when "endcomment"
comment_tag_depth -= 1
end

if comment_tag_depth.zero?
parse_context.trim_whitespace = (token[-3] == WhitespaceControl)
return false
end
if comment_tag_depth.zero?
parse_context.trim_whitespace = (token[-3] == WhitespaceControl) unless tokenizer.for_liquid_tag
return false
end
end

Expand Down
12 changes: 12 additions & 0 deletions test/unit/tags/comment_tag_unit_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,16 @@ def test_with_whitespace_control
Hello!
LIQUID
end

def test_dont_override_liquid_tag_whitespace_control
assert_template_result("Hello!World!", <<~LIQUID.chomp)
Hello!
{%- liquid
comment
this is inside a liquid tag
endcomment
-%}
World!
LIQUID
end
end