From 5c4157ece3ecf33788b297fea63581772de091cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Efe=20G=C3=B6kdemir?= Date: Fri, 13 Nov 2026 03:18:07 +0300 Subject: [PATCH] Fix Liquid terminators in incomplete HTML tags --- .changeset/soft-liquid-endtag.md | 5 ++++ crates/liquid-parser/src/html.rs | 24 +++++++++++++++---- .../liquid-html-parser/src/document/html.ts | 12 ++++++++++ .../src/test/issue-1382/fixed.liquid | 1 + .../src/test/issue-1382/index.liquid | 1 + .../src/test/issue-1382/index.spec.ts | 6 +++++ specs/parser/unclosed.yml | 7 ++++++ 7 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 .changeset/soft-liquid-endtag.md create mode 100644 packages/prettier-plugin-liquid/src/test/issue-1382/fixed.liquid create mode 100644 packages/prettier-plugin-liquid/src/test/issue-1382/index.liquid create mode 100644 packages/prettier-plugin-liquid/src/test/issue-1382/index.spec.ts diff --git a/.changeset/soft-liquid-endtag.md b/.changeset/soft-liquid-endtag.md new file mode 100644 index 000000000..b61b9cc2a --- /dev/null +++ b/.changeset/soft-liquid-endtag.md @@ -0,0 +1,5 @@ +--- +'@shopify/liquid-html-parser': patch +--- + +Stop parsing an incomplete HTML start tag before its enclosing Liquid block terminator so tolerant formatting preserves the original source. diff --git a/crates/liquid-parser/src/html.rs b/crates/liquid-parser/src/html.rs index 929071bf2..785cb3ad1 100644 --- a/crates/liquid-parser/src/html.rs +++ b/crates/liquid-parser/src/html.rs @@ -97,6 +97,20 @@ impl<'a> Parser<'a> { self.consume(TT::HtmlTagOpen)?; let name = self.parse_compound_name()?; let attributes = self.parse_attributes()?; + + if self.is_block_terminator() { + let tag_name = self.peek_tag_name().unwrap(); + let open_end = self.tokens[self.p - 1].end; + return Err(error( + format!( + "Attempting to close LiquidTag '{tag_name}' before HtmlElement '{}' was closed", + display_name(plain_name(&name)) + ), + open_start, + open_end, + )); + } + if self.accept(TT::HtmlSelfClose).is_some() { let bsp = Span::new(open_start, self.tokens[self.p - 1].end); return Ok(Node::HtmlSelfClosingElement(HtmlSelfClosingElement { @@ -408,19 +422,19 @@ impl<'a> Parser<'a> { } pub(crate) fn parse_branch_attributes(&mut self) -> PResult>> { - self.parse_attribute_list(true) + self.parse_attribute_list() } fn parse_attributes(&mut self) -> PResult>> { let saved = self.in_attribute_context; self.in_attribute_context = true; - let result = self.parse_attribute_list(false); + let result = self.parse_attribute_list(); self.in_attribute_context = saved; result } - /// `parseAttributeList`, or `parseBranchAttributesImpl` when `in_branch`. - fn parse_attribute_list(&mut self, in_branch: bool) -> PResult>> { + /// Parse HTML attributes, stopping before a Liquid block terminator. + fn parse_attribute_list(&mut self) -> PResult>> { let mut attrs = Vec::new(); while !self.is_at_end() { self.skip_space(); @@ -430,7 +444,7 @@ impl<'a> Parser<'a> { { break; } - if in_branch && self.is_block_terminator() { + if self.is_block_terminator() { break; } if self.check(TT::LiquidTagOpen, 0) { diff --git a/packages/liquid-html-parser/src/document/html.ts b/packages/liquid-html-parser/src/document/html.ts index 42194693f..622f4c0d5 100644 --- a/packages/liquid-html-parser/src/document/html.ts +++ b/packages/liquid-html-parser/src/document/html.ts @@ -86,6 +86,17 @@ export function parseHtmlElement( const name = parseCompoundName(parser); const attributes = parseAttributes(parser); + if (parser.isBlockTerminator()) { + const tagName = parser.peekTagName()!; + const openTagEnd = parser.tokenAt(parser.getPosition() - 1).end; + throw new LiquidHTMLASTParsingError( + `Attempting to close LiquidTag '${tagName}' before HtmlElement '${extractPlainName(name) || 'compound'}' was closed`, + source, + openTagStart, + openTagEnd, + ); + } + if (parser.accept(TokenType.HtmlSelfClose)) { const openTagEnd = parser.tokenAt(parser.getPosition() - 1).end; const blockStartPosition: Position = { start: openTagStart, end: openTagEnd }; @@ -513,6 +524,7 @@ function parseAttributeList(parser: HtmlParserDelegate): AttributeNode[] { skipSpace(parser); if (parser.isAtEnd()) break; if (parser.check(TokenType.HtmlTagClose) || parser.check(TokenType.HtmlSelfClose)) break; + if (parser.isBlockTerminator()) break; // Liquid tag between attributes if (parser.check(TokenType.LiquidTagOpen)) { diff --git a/packages/prettier-plugin-liquid/src/test/issue-1382/fixed.liquid b/packages/prettier-plugin-liquid/src/test/issue-1382/fixed.liquid new file mode 100644 index 000000000..77068e6e5 --- /dev/null +++ b/packages/prettier-plugin-liquid/src/test/issue-1382/fixed.liquid @@ -0,0 +1 @@ +{% capture a %} { + await assertFormattedEqualsFixed(__dirname); +}); diff --git a/specs/parser/unclosed.yml b/specs/parser/unclosed.yml index f3c58b4eb..35843fec1 100644 --- a/specs/parser/unclosed.yml +++ b/specs/parser/unclosed.yml @@ -1,4 +1,11 @@ cases: + - name: should report an endcapture inside an unclosed HTML start tag + source: "{% capture a %} {% if true %}" parse: [liquid]