');
+ expect(highlightedOffenses(file, offenses)).to.include('');
+ });
+
it('should report offenses when conditions do not match', async () => {
const file = `
diff --git a/packages/theme-check-common/src/checks/unclosed-html-element/index.ts b/packages/theme-check-common/src/checks/unclosed-html-element/index.ts
index 68b0b7661..801540418 100644
--- a/packages/theme-check-common/src/checks/unclosed-html-element/index.ts
+++ b/packages/theme-check-common/src/checks/unclosed-html-element/index.ts
@@ -139,6 +139,13 @@ export const UnclosedHTMLElement: LiquidCheckDefinition = {
async onCodePathEnd() {
for (const [grandparent, stacks] of stacksByGrandparent) {
+ // First pass: match opens/closes within each condition identifier.
+ // Collect unmatched nodes with their identifier for cross-identifier balancing.
+ const unmatchedByIdentifier = new Map<
+ ConditionIdentifer,
+ (HtmlElement | HtmlDanglingMarkerClose)[]
+ >();
+
for (const identifier of stacks.identifiers) {
const openNodes = stacks.open.get(identifier) ?? [];
const closeNodes = stacks.close.get(identifier) ?? [];
@@ -170,8 +177,44 @@ export const UnclosedHTMLElement: LiquidCheckDefinition = {
}
}
- // At the end, whatever is left in the stack is a reported offense.
- for (const node of stack) {
+ unmatchedByIdentifier.set(identifier, stack);
+ }
+
+ // Second pass: try to balance unmatched opens from one condition
+ // identifier against unmatched closes from sibling condition identifiers
+ // within the same grandparent.
+ //
+ // This handles patterns like the bento-grid where an open tag is inside
+ // `{% if forloop.first %}` and the matching close is inside
+ // `{% if forloop.last %}` -- different conditions but semantically paired.
+ const allUnmatched = ([] as (HtmlElement | HtmlDanglingMarkerClose)[])
+ .concat(...unmatchedByIdentifier.values())
+ .sort((a, b) => a.position.start - b.position.start);
+
+ const crossBalancedStack = [] as (HtmlElement | HtmlDanglingMarkerClose)[];
+ for (const node of allUnmatched) {
+ if (node.type === NodeTypes.HtmlElement) {
+ crossBalancedStack.push(node);
+ } else if (
+ crossBalancedStack.length > 0 &&
+ getName(node) === getName(crossBalancedStack.at(-1)!) &&
+ crossBalancedStack.at(-1)!.type === NodeTypes.HtmlElement &&
+ node.type === NodeTypes.HtmlDanglingMarkerClose
+ ) {
+ crossBalancedStack.pop();
+ } else {
+ crossBalancedStack.push(node);
+ }
+ }
+
+ // Build a set of nodes that were resolved by cross-identifier balancing
+ // so we can skip reporting them.
+ const crossBalancedRemaining = new Set(crossBalancedStack);
+
+ for (const [identifier, unmatched] of unmatchedByIdentifier) {
+ for (const node of unmatched) {
+ if (!crossBalancedRemaining.has(node)) continue;
+
if (node.type === NodeTypes.HtmlDanglingMarkerClose) {
context.report({
message: `Closing tag does not have a matching opening tag for condition \`${identifier}\` in ${
diff --git a/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts b/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts
index 0a7705895..e9920cb20 100644
--- a/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts
+++ b/packages/theme-check-common/src/checks/valid-block-target/index.spec.ts
@@ -1310,6 +1310,48 @@ describe('Module: ValidBlockTarget', () => {
expect(offenses[0].uri).to.equal(`file:///${path}/slideshow.liquid`);
});
+ it(`should not report errors for local blocks in presets when no root-level blocks array exists (${path} bucket)`, async () => {
+ const theme: MockTheme = {
+ 'blocks/_card.liquid': `
+ {% schema %}
+ {
+ "name": "Card",
+ "blocks": [
+ { "type": "_title" },
+ { "type": "_image" }
+ ]
+ }
+ {% endschema %}
+ `,
+ 'blocks/_title.liquid': '',
+ 'blocks/_image.liquid': '',
+ [`${path}/cards.liquid`]: `
+ {% schema %}
+ {
+ "name": "Cards",
+ "presets": [
+ {
+ "name": "Default",
+ "blocks": {
+ "card-1": {
+ "type": "_card",
+ "blocks": {
+ "title-1": { "type": "_title" },
+ "image-1": { "type": "_image" }
+ }
+ }
+ }
+ }
+ ]
+ }
+ {% endschema %}
+ `,
+ };
+
+ const offenses = await check(theme, [ValidBlockTarget]);
+ expect(offenses).to.be.empty;
+ });
+
it('should not crash or timeout with cyclical nested block relationships', async () => {
const theme: MockTheme = {
'blocks/block-b.liquid': `
diff --git a/packages/theme-check-common/src/utils/block.ts b/packages/theme-check-common/src/utils/block.ts
index 442304c45..920849383 100644
--- a/packages/theme-check-common/src/utils/block.ts
+++ b/packages/theme-check-common/src/utils/block.ts
@@ -143,6 +143,15 @@ export function isInvalidPresetBlock(
}
const isPrivateBlockType = blockNode.type.startsWith('_');
+ const hasNoRootBlocks = rootLevelThemeBlocks.length === 0;
+
+ // Local blocks referenced in presets are valid when no root-level blocks
+ // are defined. They reference block files (blocks/_name.liquid) directly
+ // and their existence is validated separately.
+ if (isPrivateBlockType && hasNoRootBlocks) {
+ return false;
+ }
+
const isThemeInRootLevel = rootLevelThemeBlocks.some((block) => block.node.type === '@theme');
const needsExplicitRootBlock = isPrivateBlockType || !isThemeInRootLevel;
const isPresetInRootLevel = rootLevelThemeBlocks.some(