allow incomplete tags inside a comment tag

This commit is contained in:
Michael Go
2023-11-08 16:50:41 -04:00
parent a681e73aec
commit e180535784
3 changed files with 4 additions and 4 deletions
+1
View File
@@ -6,6 +6,7 @@ module Liquid
class BlockBody class BlockBody
LiquidTagToken = /\A\s*(#{TagName})\s*(.*?)\z/o LiquidTagToken = /\A\s*(#{TagName})\s*(.*?)\z/o
FullToken = /\A#{TagStart}#{WhitespaceControl}?(\s*)(#{TagName})(\s*)(.*?)#{WhitespaceControl}?#{TagEnd}\z/om FullToken = /\A#{TagStart}#{WhitespaceControl}?(\s*)(#{TagName})(\s*)(.*?)#{WhitespaceControl}?#{TagEnd}\z/om
FullTokenPossiblyInvalid = /\A(.*)#{TagStart}#{WhitespaceControl}?\s*(\w+)\s*(.*)?#{WhitespaceControl}?#{TagEnd}\z/om
ContentOfVariable = /\A#{VariableStart}#{WhitespaceControl}?(.*?)#{WhitespaceControl}?#{VariableEnd}\z/om ContentOfVariable = /\A#{VariableStart}#{WhitespaceControl}?(.*?)#{WhitespaceControl}?#{VariableEnd}\z/om
WhitespaceOrNothing = /\A\s*\z/ WhitespaceOrNothing = /\A\s*\z/
TAGSTART = "{%" TAGSTART = "{%"
+2 -2
View File
@@ -41,7 +41,7 @@ module Liquid
# The children tag doesn't require to be a valid Liquid except the comment and raw tag. # The children tag doesn't require to be a valid Liquid except the comment and raw tag.
# The child comment and raw tag must be closed. # The child comment and raw tag must be closed.
while (token = tokens.send(:shift)) while (token = tokens.send(:shift))
tag_name_match = BlockBody::FullToken.match(token) tag_name_match = BlockBody::FullTokenPossiblyInvalid.match(token)
next if tag_name_match.nil? next if tag_name_match.nil?
@@ -69,7 +69,7 @@ module Liquid
def parse_raw_tag_body(tokens) def parse_raw_tag_body(tokens)
while (token = tokens.send(:shift)) while (token = tokens.send(:shift))
return if token =~ Raw::FullTokenPossiblyInvalid && "endraw" == Regexp.last_match(2) return if token =~ BlockBody::FullTokenPossiblyInvalid && "endraw" == Regexp.last_match(2)
end end
raise_tag_never_closed("raw") raise_tag_never_closed("raw")
+1 -2
View File
@@ -14,7 +14,6 @@ module Liquid
# @liquid_syntax_keyword expression The expression to be output without being rendered. # @liquid_syntax_keyword expression The expression to be output without being rendered.
class Raw < Block class Raw < Block
Syntax = /\A\s*\z/ Syntax = /\A\s*\z/
FullTokenPossiblyInvalid = /\A(.*)#{TagStart}#{WhitespaceControl}?\s*(\w+)\s*(.*)?#{WhitespaceControl}?#{TagEnd}\z/om
def initialize(tag_name, markup, parse_context) def initialize(tag_name, markup, parse_context)
super super
@@ -25,7 +24,7 @@ module Liquid
def parse(tokens) def parse(tokens)
@body = +'' @body = +''
while (token = tokens.shift) while (token = tokens.shift)
if token =~ FullTokenPossiblyInvalid && block_delimiter == Regexp.last_match(2) if token =~ BlockBody::FullTokenPossiblyInvalid && block_delimiter == Regexp.last_match(2)
parse_context.trim_whitespace = (token[-3] == WhitespaceControl) parse_context.trim_whitespace = (token[-3] == WhitespaceControl)
@body << Regexp.last_match(1) if Regexp.last_match(1) != "" @body << Regexp.last_match(1) if Regexp.last_match(1) != ""
return return