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.

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

Add a variable_name method Increment and Decrement tags objects #1609

Merged
merged 1 commit into from Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions lib/liquid/tags/decrement.rb
Expand Up @@ -19,15 +19,18 @@ module Liquid
# {% decrement variable_name %}
# @liquid_syntax_keyword variable_name The name of the variable being decremented.
class Decrement < Tag
attr_reader :variable_name

def initialize(tag_name, markup, options)
super
@variable = markup.strip
@variable_name = markup.strip
end

def render_to_output_buffer(context, output)
value = context.environments.first[@variable] ||= 0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The assignment part of ||= 0 is unnecessary, since it is assigned again after decrementing.

counter_environment = context.environments.first
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm both highlighting the fact that this environment is treated specially in this way and reducing the redundant methods calls to use this value twice

value = counter_environment[@variable_name] || 0
value -= 1
context.environments.first[@variable] = value
counter_environment[@variable_name] = value
output << value.to_s
output
end
Expand Down
9 changes: 6 additions & 3 deletions lib/liquid/tags/increment.rb
Expand Up @@ -19,14 +19,17 @@ module Liquid
# {% increment variable_name %}
# @liquid_syntax_keyword variable_name The name of the variable being incremented.
class Increment < Tag
attr_reader :variable_name

def initialize(tag_name, markup, options)
super
@variable = markup.strip
@variable_name = markup.strip
end

def render_to_output_buffer(context, output)
value = context.environments.first[@variable] ||= 0
context.environments.first[@variable] = value + 1
counter_environment = context.environments.first
value = counter_environment[@variable_name] || 0
counter_environment[@variable_name] = value + 1

output << value.to_s
output
Expand Down