update the check so that it's scope aware

Author: shoplando

packages/theme-check-common/src/checks/undefined-object/index.ts

@@ -7,6 +7,7 @@ import {
   LiquidTagDecrement,
   LiquidTagFor,
   LiquidTagIncrement,
+  LiquidTagSnippet,
   LiquidTagTablerow,
   LiquidVariableLookup,
   NamedTags,
@@ -16,7 +17,7 @@ import {
 import { LiquidCheckDefinition, Severity, SourceCodeType, ThemeDocset } from '../../types';
 import { isError, last } from '../../utils';
 import { hasLiquidDoc } from '../../liquid-doc/liquidDoc';
-import { isWithinRawTagThatDoesNotParseItsContents } from '../utils';
+import { isWithinRawTagThatDoesNotParseItsContents, findInlineSnippetAncestor } from '../utils';
 
 type Scope = { start?: number; end?: number };
 
@@ -66,9 +67,16 @@ export const UndefinedObject: LiquidCheckDefinition = {
     }
 
     return {
-      async LiquidDocParamNode(node: LiquidDocParamNode) {
+      async LiquidDocParamNode(node: LiquidDocParamNode, ancestors: LiquidHtmlNode[]) {
         const paramName = node.paramName?.value;
-        if (paramName) {
+        if (!paramName) return;
+        const snippetAncestor = findInlineSnippetAncestor(ancestors);
+        if (snippetAncestor) {
+          indexVariableScope(paramName, {
+            start: snippetAncestor.blockStartPosition.end,
+            end: snippetAncestor.blockEndPosition?.start,
+          });
+        } else {
           fileScopedVariables.add(paramName);
         }
       },
@@ -134,6 +142,10 @@ export const UndefinedObject: LiquidCheckDefinition = {
             end: node.blockEndPosition?.start,
           });
         }
+
+        if (isLiquidTagSnippet(node) && node.markup.name) {
+          fileScopedVariables.add(node.markup.name);
+        }
       },
 
       async VariableLookup(node, ancestors) {
@@ -142,9 +154,7 @@ export const UndefinedObject: LiquidCheckDefinition = {
         const parent = last(ancestors);
         if (isLiquidTag(parent) && isLiquidTagCapture(parent)) return;
 
-        if (parent?.type === NodeTypes.RenderMarkup && parent.snippet === node) return;
-
-        if (isLiquidTag(parent) && parent.name === 'snippet' && parent.markup === node) return;
+        if (isLiquidTag(parent) && isLiquidTagSnippet(parent) && parent.markup === node) return;
 
         variables.push(node);
       },
@@ -272,6 +282,10 @@ function isLiquidTagCapture(node: LiquidTag): node is LiquidTagCapture {
   return node.name === NamedTags.capture;
 }
 
+function isLiquidTagSnippet(node: LiquidTag): node is LiquidTagSnippet {
+  return node.name === NamedTags.snippet;
+}
+
 function isLiquidTagAssign(node: LiquidTag): node is LiquidTagAssign {
   return node.name === NamedTags.assign && typeof node.markup !== 'string';
 }

packages/theme-check-common/src/checks/utils.ts

@@ -13,6 +13,7 @@ import {
   LiquidTagTablerow,
   LiquidTag,
   LoopNamedTags,
+  NamedTags,
 } from '@shopify/liquid-html-parser';
 import { LiquidHtmlNodeOfType as NodeOfType } from '../types';
 
@@ -104,6 +105,16 @@ export function isLoopLiquidTag(tag: LiquidTag): tag is LiquidTagFor | LiquidTag
   return LoopNamedTags.includes(tag.name as any);
 }
 
+export function findInlineSnippetAncestor(ancestors: LiquidHtmlNode[]) {
+  for (let i = ancestors.length - 1; i >= 0; i--) {
+    const ancestor = ancestors[i];
+    if (ancestor.type === NodeTypes.LiquidTag && ancestor.name === NamedTags.snippet) {
+      return ancestor;
+    }
+  }
+  return null;
+}
+
 const RawTagsThatDoNotParseTheirContents = ['raw', 'stylesheet', 'javascript', 'schema'];
 
 function isRawTagThatDoesNotParseItsContent(node: LiquidHtmlNode) {