Merge pull request #1683 from Shopify/marco/raw-tag-whitespace-control

Allow raw tag to be used with whitespace control
Shopify · Feb 1, 2023 · 22ded5f · 22ded5f
2 parents 6a888d4 + ddc32b7
commit 22ded5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/liquid/tags/raw.rb b/lib/liquid/tags/raw.rb
@@ -14,7 +14,7 @@ module Liquid
   # @liquid_syntax_keyword expression The expression to be output without being rendered.
   class Raw < Block
     Syntax = /\A\s*\z/
-    FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
+    FullTokenPossiblyInvalid = /\A(.*)#{TagStart}#{WhitespaceControl}?\s*(\w+)\s*(.*)?#{WhitespaceControl}?#{TagEnd}\z/om
 
     def initialize(tag_name, markup, parse_context)
       super

diff --git a/test/integration/tags/raw_tag_test.rb b/test/integration/tags/raw_tag_test.rb
@@ -11,7 +11,8 @@ def test_tag_in_raw
   end
 
   def test_output_in_raw
-    assert_template_result('{{ test }}', '{% raw %}{{ test }}{% endraw %}')
+    # assert_template_result('{{ test }}', '{% raw %}{{ test }}{% endraw %}')
+    assert_template_result('>{{ test }}<', '> {%- raw -%}{{ test }}{%- endraw -%} <')
   end
 
   def test_open_tag_in_raw