Skip to content

Fix raw closing tags immediately after a variable opener #2127

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

Open
mehuljariwala wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix raw closing tags immediately after a variable opener #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b712cda
Fix raw closing tags immediately after a variable opener
mehuljariwala Oct 1, 2026
8c2685e
Re-run Shopify CLA verification after signing
mehuljariwala Oct 1, 2026
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
6 changes: 6 additions & 0 deletions lib/liquid/tokenizer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class Tokenizer
TAG_END = /%\}/
TAG_OR_VARIABLE_START = /\{[\{\%]/
NEWLINE = /\n/
RAW_TAG_END = /-?\s*endraw\s*-?%\}/

OPEN_CURLEY = "{".ord
CLOSE_CURLEY = "}".ord
Expand Down Expand Up @@ -116,6 +117,11 @@ def next_variable_token

byte_a = byte_b = @ss.scan_byte

# The second opening brace can start a tag, e.g. {{% endraw %}}.
if byte_a == PERCENTAGE && @ss.match?(RAW_TAG_END)
return next_tag_token_with_start(start)
end

while byte_b
byte_a = @ss.scan_byte while byte_a && byte_a != CLOSE_CURLEY && byte_a != OPEN_CURLEY

Expand Down
6 changes: 6 additions & 0 deletions test/integration/tags/raw_tag_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,10 @@ def test_invalid_raw
assert_match_syntax_error(/Valid syntax/, '{% raw } foo {% endraw %}')
assert_match_syntax_error(/Valid syntax/, '{% raw } foo %}{% endraw %}')
end

def test_endraw_after_variable_start_with_trailing_brace
assert_template_result('%{}x', '{%raw%}%{{%endraw%}}{%raw%}x{%endraw%}')
assert_template_result('{}}after', '{% raw %}{{% endraw %}}}after')
assert_template_result('{x', '{% raw %}{{%- endraw -%} {{ "x" }}')
end
end
Loading