Skip to content

Add strict2_parse to increment and decrement tags #2067

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
aswamy wants to merge 1 commit into
base: strict2-assign-capture
Choose a base branch
from
+82 −4
Open

Add strict2_parse to increment and decrement tags #2067

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
16 changes: 16 additions & 0 deletions lib/liquid/tags/decrement.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,29 @@ module Liquid
# {% decrement variable_name %}
# @liquid_syntax_keyword variable_name The name of the variable being decremented.
class Decrement < Tag
include ParserSwitching

attr_reader :variable_name

def initialize(tag_name, markup, options)
super
parse_with_selected_parser(markup)
end

def lax_parse(markup)
@variable_name = markup.strip
end

def strict_parse(markup)
lax_parse(markup)
end

def strict2_parse(markup)
p = @parse_context.new_parser(markup.strip)
@variable_name = p.consume(:id)
p.consume(:end_of_string)
end

def render_to_output_buffer(context, output)
counter_environment = context.environments.first
value = counter_environment[@variable_name] || 0
Expand Down
16 changes: 16 additions & 0 deletions lib/liquid/tags/increment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,29 @@ module Liquid
# {% increment variable_name %}
# @liquid_syntax_keyword variable_name The name of the variable being incremented.
class Increment < Tag
include ParserSwitching

attr_reader :variable_name

def initialize(tag_name, markup, options)
super
parse_with_selected_parser(markup)
end

def lax_parse(markup)
@variable_name = markup.strip
end

def strict_parse(markup)
lax_parse(markup)
end

def strict2_parse(markup)
p = @parse_context.new_parser(markup.strip)
@variable_name = p.consume(:id)
p.consume(:end_of_string)
end
Comment on lines +43 to +47
Copy link
Copy Markdown
Contributor Author

@aswamy aswamy Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i thought of merging the code between increment and decrement since they share so much, but didn't see it with other similar tags like case and if so i just kept it verbose

Copy link
Copy Markdown
Contributor

@EvilGenius13 EvilGenius13 Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fair to leave them separate. I do have a question.

The guard return @variable_name = stripped if stripped.empty? - I think we want to remove it because in other tags like capture if we don't find a variable name we raise a syntax error through p.consume(:id)

Copy link
Copy Markdown
Contributor Author

@aswamy aswamy Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm yeah i think that's fair. I looked at how lax mode handles {% increment %} (without a variable name) and apparently it's allowed. Internally, it looks like it's creating an empty-string variable that can be accessed via self[""]. Ill rewrite this into a valid variable name. Good catch!


def render_to_output_buffer(context, output)
counter_environment = context.environments.first
value = counter_environment[@variable_name] || 0
Expand Down
46 changes: 46 additions & 0 deletions test/integration/tags/increment_tag_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,50 @@ def test_dec
'{%decrement starboard %}',
)
end

def test_increment_strict2_rejects_invalid_variable_name
assert_raises(Liquid::SyntaxError) do
Template.parse('{% increment foo bar %}', error_mode: :strict2)
end
end

def test_increment_strict2_rejects_variable_starting_with_number
assert_raises(Liquid::SyntaxError) do
Template.parse('{% increment 11aa %}', error_mode: :strict2)
end
end

def test_increment_strict2_accepts_valid_variable_name
template = Template.parse('{% increment my-var %}', error_mode: :strict2)
assert_equal('0', template.render)
end

def test_decrement_strict2_rejects_invalid_variable_name
assert_raises(Liquid::SyntaxError) do
Template.parse('{% decrement foo bar %}', error_mode: :strict2)
end
end

def test_decrement_strict2_rejects_variable_starting_with_number
assert_raises(Liquid::SyntaxError) do
Template.parse('{% decrement 11aa %}', error_mode: :strict2)
end
end

def test_decrement_strict2_accepts_valid_variable_name
template = Template.parse('{% decrement my-var %}', error_mode: :strict2)
assert_equal('-1', template.render)
end

def test_increment_strict2_rejects_empty_variable_name
assert_raises(Liquid::SyntaxError) do
Template.parse('{% increment %}', error_mode: :strict2)
end
end

def test_decrement_strict2_rejects_empty_variable_name
assert_raises(Liquid::SyntaxError) do
Template.parse('{% decrement %}', error_mode: :strict2)
end
end
end
8 changes: 4 additions & 4 deletions test/integration/tags/render_tag_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,16 @@ def test_break_through_render
def test_increment_is_isolated_between_renders
assert_template_result(
'010',
'{% increment %}{% increment %}{% render "incr" %}',
partials: { 'incr' => '{% increment %}' },
'{% increment port %}{% increment port %}{% render "incr" %}',
partials: { 'incr' => '{% increment port %}' },
)
end

def test_decrement_is_isolated_between_renders
assert_template_result(
'-1-2-1',
'{% decrement %}{% decrement %}{% render "decr" %}',
partials: { 'decr' => '{% decrement %}' },
'{% decrement port %}{% decrement port %}{% render "decr" %}',
partials: { 'decr' => '{% decrement port %}' },
)
end

Expand Down
Loading