Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-19 10:52:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Simplify render/include tags following PR review feedback

Browse Source
This commit is contained in:
Guilherme Carreiro
2025-10-27 16:33:31 +01:00
committed by Guilherme Carreiro
parent 15430c0770
commit e57b7efe4e
3 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/tags/include.rb
+3 -15
View File
@@ -88,20 +88,9 @@ module Liquid
p = @parse_context.new_parser(markup) p = @parse_context.new_parser(markup)
@template_name_expr = safe_parse_expression(p) @template_name_expr = safe_parse_expression(p)
with_or_for = p.id?("for") || p.id?("with") || nil @variable_name_expr = safe_parse_expression(p) if p.id?("for") || p.id?("with")
@variable_name_expr = nil @alias_name = p.consume(:id) if p.id?("as")
if with_or_for
@variable_name_expr = safe_parse_expression(p)
end
alias_name = nil
if p.id?("as")
alias_name = p.consume(:id)
end
@alias_name = alias_name
# optional comma
p.consume?(:comma) p.consume?(:comma)
@attributes = {} @attributes = {}
@@ -109,7 +98,7 @@ module Liquid
key = p.consume key = p.consume
p.consume(:colon) p.consume(:colon)
@attributes[key] = safe_parse_expression(p) @attributes[key] = safe_parse_expression(p)
p.consume?(:comma) # optional comma p.consume?(:comma)
end end
p.consume(:end_of_string) p.consume(:end_of_string)
@@ -121,7 +110,6 @@ module Liquid
def lax_parse(markup) def lax_parse(markup)
if markup =~ SYNTAX if markup =~ SYNTAX
template_name = Regexp.last_match(1) template_name = Regexp.last_match(1)
variable_name = Regexp.last_match(3) variable_name = Regexp.last_match(3)
lib/liquid/tags/render.rb
+5 -15
View File
@@ -89,21 +89,11 @@ module Liquid
p = @parse_context.new_parser(markup) p = @parse_context.new_parser(markup)
@template_name_expr = parse_expression(rigid_template_name(p), safe: true) @template_name_expr = parse_expression(rigid_template_name(p), safe: true)
@variable_name_expr = nil with_or_for = p.id?("for") || p.id?("with")
with_or_for = p.id?("for") || p.id?("with") || nil @variable_name_expr = safe_parse_expression(p) if with_or_for
if with_or_for @alias_name = p.consume(:id) if p.id?("as")
@variable_name_expr = safe_parse_expression(p) @is_for_loop = (with_or_for == FOR)
end
alias_name = nil
if p.id?("as")
alias_name = p.consume(:id)
end
@alias_name = alias_name
@is_for_loop = (with_or_for == FOR)
# optional comma
p.consume?(:comma) p.consume?(:comma)
@attributes = {} @attributes = {}
@@ -111,7 +101,7 @@ module Liquid
key = p.consume key = p.consume
p.consume(:colon) p.consume(:colon)
@attributes[key] = safe_parse_expression(p) @attributes[key] = safe_parse_expression(p)
p.consume?(:comma) # optional comma p.consume?(:comma)
end end
p.consume(:end_of_string) p.consume(:end_of_string)
lib/liquid/tags/table_row.rb
+1 -2
View File
@@ -45,7 +45,6 @@ module Liquid
@collection_name = safe_parse_expression(p) @collection_name = safe_parse_expression(p)
# optional comma
p.consume?(:comma) p.consume?(:comma)
@attributes = {} @attributes = {}
@@ -57,7 +56,7 @@ module Liquid
p.consume(:colon) p.consume(:colon)
@attributes[key] = safe_parse_expression(p) @attributes[key] = safe_parse_expression(p)
p.consume?(:comma) # optional comma p.consume?(:comma)
end end
p.consume(:end_of_string) p.consume(:end_of_string)