mirror of
https://github.com/Shopify/liquid.git
synced 2026-10-03 09:05:13 -07:00
fix quirky negative sign expression markup parsing
This commit is contained in:
+1
-1
@@ -68,7 +68,6 @@ require 'liquid/extensions'
|
|||||||
require 'liquid/errors'
|
require 'liquid/errors'
|
||||||
require 'liquid/interrupts'
|
require 'liquid/interrupts'
|
||||||
require 'liquid/strainer_template'
|
require 'liquid/strainer_template'
|
||||||
require 'liquid/expression'
|
|
||||||
require 'liquid/context'
|
require 'liquid/context'
|
||||||
require 'liquid/tag'
|
require 'liquid/tag'
|
||||||
require 'liquid/block_body'
|
require 'liquid/block_body'
|
||||||
@@ -77,6 +76,7 @@ require 'liquid/variable'
|
|||||||
require 'liquid/variable_lookup'
|
require 'liquid/variable_lookup'
|
||||||
require 'liquid/range_lookup'
|
require 'liquid/range_lookup'
|
||||||
require 'liquid/resource_limits'
|
require 'liquid/resource_limits'
|
||||||
|
require 'liquid/expression'
|
||||||
require 'liquid/template'
|
require 'liquid/template'
|
||||||
require 'liquid/condition'
|
require 'liquid/condition'
|
||||||
require 'liquid/utils'
|
require 'liquid/utils'
|
||||||
|
|||||||
@@ -57,7 +57,8 @@ module Liquid
|
|||||||
'true' => true,
|
'true' => true,
|
||||||
'false' => false,
|
'false' => false,
|
||||||
'blank' => '',
|
'blank' => '',
|
||||||
'empty' => ''
|
'empty' => '',
|
||||||
|
'-' => VariableLookup.parse("-")
|
||||||
}.freeze
|
}.freeze
|
||||||
|
|
||||||
DOT = ".".ord
|
DOT = ".".ord
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class ExpressionTest < Minitest::Test
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_float
|
def test_float
|
||||||
assert_template_result("-17.42", "{{ -17.42 }}")
|
assert_template_result("-17.42", "{{ -17.42 }}")
|
||||||
assert_template_result("2.5", "{{ 2.5 }}")
|
assert_template_result("2.5", "{{ 2.5 }}")
|
||||||
assert_expression_result(1.5, "1.5")
|
assert_expression_result(1.5, "1.5")
|
||||||
end
|
end
|
||||||
@@ -42,6 +42,18 @@ class ExpressionTest < Minitest::Test
|
|||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_quirky_negative_sign_expression_markup
|
||||||
|
result = Expression.parse("-")
|
||||||
|
assert(result.is_a?(VariableLookup))
|
||||||
|
assert_equal("-", result.name)
|
||||||
|
|
||||||
|
# for this template, the expression markup is "-"
|
||||||
|
assert_template_result(
|
||||||
|
"",
|
||||||
|
"{{ - 'theme.css' - }}",
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def assert_expression_result(expect, markup, **assigns)
|
def assert_expression_result(expect, markup, **assigns)
|
||||||
|
|||||||
Reference in New Issue
Block a user