fix parsing UTF-8 multi byte string expression

Shopify · Nov 8, 2024 · 10ef505 · 10ef505
1 parent abe3dec
commit 10ef505
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/liquid/expression.rb b/lib/liquid/expression.rb
@@ -68,13 +68,15 @@ class Expression2
     RANGES_REGEX = /\A\(\s*(?>(\S+)\s*\.\.)\s*(\S+)\s*\)\z/
 
     def self.parse(markup)
-      return nil unless markup
+      return unless markup
 
       markup = markup.strip # markup can be a frozen string
 
+      return if markup.length == 0
+
       if (markup.start_with?('"') && markup.end_with?('"')) ||
         (markup.start_with?("'") && markup.end_with?("'"))
-        return markup.byteslice(1, markup.length - 2)
+        return markup[1..-2]
       elsif (markup.start_with?("(") && markup.end_with?(")")) && markup =~ RANGES_REGEX
         return RangeLookup.parse(Regexp.last_match(1), Regexp.last_match(2))
       end

diff --git a/test/integration/expression_test.rb b/test/integration/expression_test.rb
@@ -13,6 +13,7 @@ def test_string
     assert_template_result("double quoted", '{{"double quoted"}}')
     assert_template_result("spaced", "{{ 'spaced' }}")
     assert_template_result("spaced2", "{{ 'spaced2' }}")
+    assert_template_result("emoji🔥", "{{ 'emoji🔥' }}")
   end
 
   def test_int