mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-28 22:55:12 -07:00
Update Include#format for recent changes in master
This commit is contained in:
@@ -25,7 +25,6 @@ module Liquid
|
|||||||
template_name = $1
|
template_name = $1
|
||||||
variable_name = $3
|
variable_name = $3
|
||||||
|
|
||||||
@has_with_clause = !variable_name.nil?
|
|
||||||
@variable_name_expr = variable_name ? Expression.parse(variable_name) : nil
|
@variable_name_expr = variable_name ? Expression.parse(variable_name) : nil
|
||||||
@template_name_expr = Expression.parse(template_name)
|
@template_name_expr = Expression.parse(template_name)
|
||||||
@attributes = {}
|
@attributes = {}
|
||||||
@@ -72,11 +71,11 @@ module Liquid
|
|||||||
end
|
end
|
||||||
|
|
||||||
def format
|
def format
|
||||||
segments = [@tag_name, Expression.format(@template_name)]
|
segments = [@tag_name, Expression.format(@template_name_expr)]
|
||||||
|
|
||||||
if @has_with_clause
|
if @variable_name_expr
|
||||||
segments << "with"
|
segments << "with"
|
||||||
segments << Expression.format(@variable_name)
|
segments << Expression.format(@variable_name_expr)
|
||||||
end
|
end
|
||||||
|
|
||||||
unless @attributes.empty?
|
unless @attributes.empty?
|
||||||
|
|||||||
Reference in New Issue
Block a user