theme-check 1.5.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 960f944628496ea317205e34678a78ec1e560dbfb48f40cfa33be2d82ebe4770
-  data.tar.gz: 66e2abe15609c6e5a40d13d05aa0daedf9fbd783e31226bbfb0c6961c1d89ad6
+  metadata.gz: 943f8cb722f6c19c1c41e494622922e608a99b50e4ad67f2288a2ed99f406ff3
+  data.tar.gz: a8fd83f054895fd366bba2512ff6431d8c470bb3e013ff6c6bf9f6be5366bf38
 SHA512:
-  metadata.gz: d920362e7729fc739c0a0202e00a605025db3d80c2fdfac5be9d6d9ea6c74bc4922baa82e093851432417863106c14964f6fdc76f66e55fd7947f33887b989c1
-  data.tar.gz: 26eb4ba427e8380ece15160c2c27cd052802ec233bb61a4a17e36dcf7f008cc7bc569b71649c525c6d57a7d79654469af65ec664726665584806928cf7258483
+  metadata.gz: fb37aed715f2b9f2dd0a8c17f2abf69110d583280d88508ef3f6ee439989c63fe9819025d870cfc1ed64a8deaac19586ac48ab261495e7a371575d9971754980
+  data.tar.gz: 64727b7c9684fa094ce498c09a2a3f1dc06ce10fa99aed066af2aa327bd4de70fcc728f76ad127fd08d7b1b6e28b42b06acf96d83b26193814e7eed1b19a2008

data/.github/workflows/theme-check.yml

@@ -8,15 +8,23 @@ jobs:
 
     strategy:
       matrix:
-        platform: [ubuntu-latest, windows-latest]
+        platform:
+          - ubuntu-latest
+          - windows-latest
         version:
           - 3.0.0
           - 2.6.6
+        theme:
+          - Shopify/dawn
 
     name: Ruby ${{ matrix.platform }} ${{ matrix.version }}
 
     steps:
     - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
+      with:
+        repository: ${{ matrix.theme }}
+        path: ./crash-test-theme
     - name: Set up Ruby ${{ matrix.version }}
       uses: ruby/setup-ruby@v1
       with:
@@ -30,6 +38,6 @@ jobs:
       run: bundle install --jobs=3 --retry=3 --path=vendor/bundle
     - name: Run tests
       run: bundle exec rake
-    - name: Test runtime
-      # Testing that runtime can execute, not testing the results themselves
-      run: bundle exec theme-check ./test/theme | grep -q "files inspected"
+    - name: Crash test
+      run: |
+        bundle exec theme-check --fail-level crash ./crash-test-theme

data/CHANGELOG.md

@@ -1,4 +1,41 @@
 
+v1.7.0 / 2021-09-20
+===================
+
+### Features
+
+  * Handle LSP messages concurrently in the Language Server ([#459](https://github.com/shopify/theme-check/issues/459))
+    * Adds progress reporting while checking (:eyes: VS Code status bar)
+    * Makes completions work while checking (more noticeable on Windows since ruby is 3x slower on Windows)
+
+v1.6.2 / 2021-09-16
+===================
+
+  * SpaceInsideBraces fixup for tags without arguments ([#458](https://github.com/shopify/theme-check/issues/458))
+  * Fix UnusedAssign bug when variable used in for loop range by bumping Liquid to 5.1 ([#456](https://github.com/shopify/theme-check/issues/456))
+
+v1.6.1 / 2021-09-15
+===================
+
+  * Fix `Undefined method `-' for nil:NilClass` in Node when tag was missing surrounding spaces ([#454](https://github.com/shopify/theme-check/issues/454), [#452](https://github.com/shopify/theme-check/issues/452))
+
+v1.6.0 / 2021-09-14
+===================
+
+### Features
+
+  * Add `--auto-correct` support to `TranslationKeyExists` (add missing translation as TODO to default locale) ([#422](https://github.com/shopify/theme-check/issues/422))
+  * Add `--auto-correct` support to `UnusedSnippet` (delete unused file) ([#416](https://github.com/shopify/theme-check/issues/416))
+  * Add `--auto-correct` support to `MissingRequiredTemplateFiles` (create missing files) ([#385](https://github.com/shopify/theme-check/issues/385))
+
+### Fixes
+
+  * Fix `undefined method [] of nil` in `replace_placeholders` ([#441](https://github.com/shopify/theme-check/issues/441), [#444](https://github.com/shopify/theme-check/issues/444))
+  * Disable ConvertIncludeToRender corrector until we fix [#445](https://github.com/shopify/theme-check/issues/445) ([#446](https://github.com/shopify/theme-check/issues/446))
+  * Fix a couple of correction bugs ([#442](https://github.com/shopify/theme-check/issues/442), [#439](https://github.com/shopify/theme-check/issues/439))
+  * Fix `AssetSizeCSS` error when size is nil ([#419](https://github.com/shopify/theme-check/issues/419))
+  * Write JSON to file, not a Ruby Hash. ([#434](https://github.com/shopify/theme-check/issues/434), [#432](https://github.com/shopify/theme-check/issues/432))
+
 v1.5.2 / 2021-09-09
 ===================
 

data/docs/api/html_check.md

@@ -16,18 +16,18 @@ module ThemeCheck
     severity :suggestion # :error or :style
 
     def on_document(node)
-      # Called with the root node of all templates
-      node.value    # is an instance of Nokogiri::XML::Node
-      node.template # is the template being analyzed, See lib/theme_check/template.rb.
-      node.parent   # is the parent node.
-      node.children # are the children nodes.
+      # Called with the root node of all theme files
+      node.value      # is an instance of Nokogiri::XML::Node
+      node.theme_file # is the html_file being analyzed, See lib/theme_check/theme_file.rb.
+      node.parent     # is the parent node.
+      node.children   # are the children nodes.
       # See lib/theme_check/html_node.rb for more helper methods
-      theme # Gives you access to all the templates in the theme. See lib/theme_check/theme.rb.
+      theme # Gives you access to all the theme files in the theme. See lib/theme_check/theme.rb.
     end
 
     def on_img(node)
       # Called for every <img> element in the file.
-      node.attrbutes["class"] # Get the class attribute of the img element.
+      node.attributes["class"] # Get the class attribute of the img element.
     end
 
     def on_a(node)

data/docs/api/liquid_check.md

@@ -16,13 +16,13 @@ module ThemeCheck
     severity :suggestion # :error or :style
 
     def on_document(node)
-      # Called with the root node of all templates
-      node.value    # is the original Liquid object for this node. See Liquid source code for details.
-      node.template # is the template being analyzed, See lib/theme_check/template.rb.
-      node.parent   # is the parent node.
-      node.children # are the children nodes.
+      # Called with the root node of all liquid_file
+      node.value      # is the original Liquid object for this node. See Liquid source code for details.
+      node.theme_file # is the liquid_file being analyzed, See lib/theme_check/liquid_file.rb.
+      node.parent     # is the parent node.
+      node.children   # are the children nodes.
       # See lib/theme_check/node.rb for more helper methods
-      theme # Gives you access to all the templates in the theme. See lib/theme_check/theme.rb.
+      theme # Gives you access to all the theme files in the theme. See lib/theme_check/theme.rb.
     end
 
     def on_node(node)
@@ -38,8 +38,8 @@ module ThemeCheck
       
       # If you find an issue, add an offense:
       add_offense("Describe the problem...", node: node)
-      # Or, if the offense is related to the whole template:
-      add_offense("Describe the problem...", template: node.template)
+      # Or, if the offense is related to the whole theme file:
+      add_offense("Describe the problem...", theme_file: node.theme_file)
     end
 
     def on_assign(node)
@@ -50,7 +50,7 @@ module ThemeCheck
       # Called for every `String` (including inside if conditions).
       if node.parent.block?
         # If parent is a block, `node.value` is a String written directly to the output when
-        # the template is rendered.
+        # the theme file is rendered.
       end
     end
 
@@ -59,7 +59,7 @@ module ThemeCheck
     end
 
     def on_error(exception)
-      # Called each time a Liquid exception is raised while parsing the template
+      # Called each time a Liquid exception is raised while parsing the theme file
     end
 
     def on_end

data/docs/checks/convert_include_to_render.md

@@ -2,7 +2,7 @@
 
 The `include` tag is [deprecated][deprecated]. This tag exists to enforce the use of the `render` tag instead of `include`.
 
-The `include` tag works similarly to the `render` tag, but it lets the code inside of the snippet to access and overwrite the variables within its parent template. The `include` tag has been deprecated because the way that it handles variables reduces performance and makes theme code harder to both read and maintain.
+The `include` tag works similarly to the `render` tag, but it lets the code inside of the snippet to access and overwrite the variables within its parent theme file. The `include` tag has been deprecated because the way that it handles variables reduces performance and makes theme code harder to both read and maintain.
 
 ## Check Details
 

data/docs/checks/missing_enable_comment.md

@@ -1,6 +1,6 @@
 # Prevent missing theme-check-enable comments (`MissingEnableComment`)
 
-When `theme-check-disable` is used in the middle of a template, the corresponding `theme-check-enable` comment should also be included.
+When `theme-check-disable` is used in the middle of a theme file, the corresponding `theme-check-enable` comment should also be included.
 
 ## Check Details
 

data/lib/theme_check/analyzer.rb

@@ -29,19 +29,36 @@ module ThemeCheck
         @html_checks.flat_map(&:offenses)
     end
 
+    def json_file_count
+      @json_file_count ||= @theme.json.size
+    end
+
+    def liquid_file_count
+      @liquid_file_count ||= @theme.liquid.size
+    end
+
+    def total_file_count
+      json_file_count + liquid_file_count
+    end
+
     def analyze_theme
       reset
 
-      liquid_visitor = Visitor.new(@liquid_checks, @disabled_checks)
+      liquid_visitor = LiquidVisitor.new(@liquid_checks, @disabled_checks)
       html_visitor = HtmlVisitor.new(@html_checks)
+
       ThemeCheck.with_liquid_c_disabled do
-        @theme.liquid.each do |template|
-          liquid_visitor.visit_template(template)
-          html_visitor.visit_template(template)
+        @theme.liquid.each_with_index do |liquid_file, i|
+          yield(liquid_file.relative_path.to_s, i, total_file_count) if block_given?
+          liquid_visitor.visit_liquid_file(liquid_file)
+          html_visitor.visit_liquid_file(liquid_file)
         end
       end
 
-      @theme.json.each { |json_file| @json_checks.call(:on_file, json_file) }
+      @theme.json.each_with_index do |json_file, i|
+        yield(json_file.relative_path.to_s, liquid_file_count + i, total_file_count) if block_given?
+        @json_checks.call(:on_file, json_file)
+      end
 
       finish
     end
@@ -51,23 +68,30 @@ module ThemeCheck
 
       ThemeCheck.with_liquid_c_disabled do
         # Call all checks that run on the whole theme
-        liquid_visitor = Visitor.new(@liquid_checks.whole_theme, @disabled_checks)
+        liquid_visitor = LiquidVisitor.new(@liquid_checks.whole_theme, @disabled_checks)
         html_visitor = HtmlVisitor.new(@html_checks.whole_theme)
-        @theme.liquid.each do |template|
-          liquid_visitor.visit_template(template)
-          html_visitor.visit_template(template)
+        total = total_file_count + files.size
+        @theme.liquid.each_with_index do |liquid_file, i|
+          yield(liquid_file.relative_path.to_s, i, total) if block_given?
+          liquid_visitor.visit_liquid_file(liquid_file)
+          html_visitor.visit_liquid_file(liquid_file)
+        end
+
+        @theme.json.each_with_index do |json_file, i|
+          yield(json_file.relative_path.to_s, liquid_file_count + i, total) if block_given?
+          @json_checks.whole_theme.call(:on_file, json_file)
         end
-        @theme.json.each { |json_file| @json_checks.whole_theme.call(:on_file, json_file) }
 
         # Call checks that run on a single files, only on specified file
-        liquid_visitor = Visitor.new(@liquid_checks.single_file, @disabled_checks)
+        liquid_visitor = LiquidVisitor.new(@liquid_checks.single_file, @disabled_checks)
         html_visitor = HtmlVisitor.new(@html_checks.single_file)
-        files.each do |file|
-          if file.liquid?
-            liquid_visitor.visit_template(file)
-            html_visitor.visit_template(file)
-          elsif file.json?
-            @json_checks.single_file.call(:on_file, file)
+        files.each_with_index do |theme_file, i|
+          yield(theme_file.relative_path.to_s, total_file_count + i, total) if block_given?
+          if theme_file.liquid?
+            liquid_visitor.visit_liquid_file(theme_file)
+            html_visitor.visit_liquid_file(theme_file)
+          elsif theme_file.json?
+            @json_checks.single_file.call(:on_file, theme_file)
           end
         end
       end
@@ -86,6 +110,11 @@ module ThemeCheck
     def correct_offenses
       if @auto_correct
         offenses.each(&:correct)
+      end
+    end
+
+    def write_corrections
+      if @auto_correct
         @theme.liquid.each(&:write)
         @theme.json.each(&:write)
       end

data/lib/theme_check/asset_file.rb

@@ -9,10 +9,21 @@ module ThemeCheck
       @content = nil
     end
 
-    alias_method :content, :source
+    def rewriter
+      @rewriter ||= ThemeFileRewriter.new(@relative_path, source)
+    end
+
+    def write
+      content = rewriter.to_s
+      if source != content
+        @storage.write(@relative_path, content.gsub("\n", @eol))
+        @source = content
+        @rewriter = nil
+      end
+    end
 
     def gzipped_size
-      @gzipped_size ||= Zlib.gzip(content).bytesize
+      @gzipped_size ||= Zlib.gzip(source).bytesize
     end
 
     def name

data/lib/theme_check/check.rb

@@ -46,7 +46,7 @@ module ThemeCheck
       end
 
       def severity_value(severity)
-        SEVERITY_VALUES[severity]
+        SEVERITY_VALUES[severity] || -1
       end
 
       def categories(*categories)
@@ -91,8 +91,8 @@ module ThemeCheck
       @offenses ||= []
     end
 
-    def add_offense(message, node: nil, template: node&.template, markup: nil, line_number: nil, node_markup_offset: 0, &block)
-      offenses << Offense.new(check: self, message: message, template: template, node: node, markup: markup, line_number: line_number, node_markup_offset: node_markup_offset, correction: block)
+    def add_offense(message, node: nil, theme_file: node&.theme_file, markup: nil, line_number: nil, node_markup_offset: 0, &block)
+      offenses << Offense.new(check: self, message: message, theme_file: theme_file, node: node, markup: markup, line_number: line_number, node_markup_offset: node_markup_offset, correction: block)
     end
 
     def severity

data/lib/theme_check/checks/asset_size_css.rb

@@ -22,5 +22,20 @@ module ThemeCheck
         node: node
       )
     end
+
+    def href_to_file_size(href)
+      # asset_url (+ optional stylesheet_tag) variables
+      if href =~ /^#{LIQUID_VARIABLE}$/o && href =~ /asset_url/ && href =~ Liquid::QuotedString
+        asset_id = Regexp.last_match(0).gsub(START_OR_END_QUOTE, "")
+        asset = @theme.assets.find { |a| a.name.end_with?("/" + asset_id) }
+        return if asset.nil?
+        asset.gzipped_size
+
+      # remote URLs
+      elsif href =~ %r{^(https?:)?//}
+        asset = RemoteAssetFile.from_src(href)
+        asset.gzipped_size
+      end
+    end
   end
 end

data/lib/theme_check/checks/asset_size_css_stylesheet_tag.rb

@@ -13,12 +13,29 @@ module ThemeCheck
     def on_variable(node)
       used_filters = node.value.filters.map { |name, *_rest| name }
       return unless used_filters.include?("stylesheet_tag")
-      file_size = href_to_file_size('{{' + node.markup + '}}')
+      file_size = stylesheet_tag_pipeline_to_file_size(node.markup)
+      return if file_size.nil?
       return if file_size <= @threshold_in_bytes
       add_offense(
         "CSS on every page load exceeding compressed size threshold (#{@threshold_in_bytes} Bytes).",
         node: node
       )
     end
+
+    def stylesheet_tag_pipeline_to_file_size(href)
+      # asset_url
+      if href =~ /asset_url/ && href =~ Liquid::QuotedString
+        asset_id = Regexp.last_match(0).gsub(START_OR_END_QUOTE, "")
+        asset = @theme.assets.find { |a| a.name.end_with?("/" + asset_id) }
+        return if asset.nil?
+        asset.gzipped_size
+
+      # remote URLs
+      elsif href =~ %r{(https?:)?//[^'"]+}
+        url = Regexp.last_match(0)
+        asset = RemoteAssetFile.from_src(url)
+        asset.gzipped_size
+      end
+    end
   end
 end

data/lib/theme_check/checks/convert_include_to_render.rb

@@ -8,7 +8,8 @@ module ThemeCheck
 
     def on_include(node)
       add_offense("`include` is deprecated - convert it to `render`", node: node) do |corrector|
-        corrector.replace(node, "render \'#{node.value.template_name_expr}\' ")
+        # We need to fix #445 and pass the variables from the context or don't replace at all.
+        # corrector.replace(node, "render \'#{node.value.template_name_expr}\' ")
       end
     end
   end

data/lib/theme_check/checks/html_parsing_error.rb

@@ -5,8 +5,8 @@ module ThemeCheck
     category :html
     doc docs_url(__FILE__)
 
-    def on_parse_error(exception, template)
-      add_offense("HTML in this template can not be parsed: #{exception.message}", template: template)
+    def on_parse_error(exception, theme_file)
+      add_offense("HTML in this template can not be parsed: #{exception.message}", theme_file: theme_file)
     end
   end
 end

data/lib/theme_check/checks/matching_translations.rb

@@ -23,7 +23,7 @@ module ThemeCheck
 
       @files.each do |file|
         diff = LocaleDiff.new(@theme.default_locale_json.content, file.content)
-        diff.add_as_offenses(self, template: file)
+        diff.add_as_offenses(self, theme_file: file)
       end
     end
   end

data/lib/theme_check/checks/missing_required_template_files.rb

@@ -9,19 +9,33 @@ module ThemeCheck
     doc docs_url(__FILE__)
 
     REQUIRED_LIQUID_FILES = %w(layout/theme)
-    REQUIRED_TEMPLATE_FILES = %w(
-      index product collection cart blog article page list-collections search 404
+
+    REQUIRED_LIQUID_TEMPLATE_FILES = %w(
       gift_card customers/account customers/activate_account customers/addresses
-      customers/login customers/order customers/register customers/reset_password password
-    )
-      .map { |file| "templates/#{file}" }
+      customers/login customers/order customers/register customers/reset_password
+    ).map { |file| "templates/#{file}" }
+
+    REQUIRED_JSON_TEMPLATE_FILES = %w(
+      index product collection cart blog article page list-collections search 404
+      password
+    ).map { |file| "templates/#{file}" }
+
+    REQUIRED_TEMPLATE_FILES = (REQUIRED_LIQUID_TEMPLATE_FILES + REQUIRED_JSON_TEMPLATE_FILES)
 
     def on_end
       (REQUIRED_LIQUID_FILES - theme.liquid.map(&:name)).each do |file|
-        add_offense("'#{file}.liquid' is missing")
+        add_offense("'#{file}.liquid' is missing") do |corrector|
+          corrector.create(@theme, "#{file}.liquid", "")
+        end
       end
       (REQUIRED_TEMPLATE_FILES - (theme.liquid + theme.json).map(&:name)).each do |file|
-        add_offense("'#{file}.liquid' or '#{file}.json' is missing")
+        add_offense("'#{file}.liquid' or '#{file}.json' is missing") do |corrector|
+          if REQUIRED_LIQUID_TEMPLATE_FILES.include?(file)
+            corrector.create(@theme, "#{file}.liquid", "")
+          else
+            corrector.create(@theme, "#{file}.json", "")
+          end
+        end
       end
     end
   end

data/lib/theme_check/checks/missing_template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module ThemeCheck
-  # Reports missing include/render/section template
+  # Reports missing include/render/section liquid file
   class MissingTemplate < LiquidCheck
     severity :suggestion
     category :liquid
@@ -12,17 +12,17 @@ module ThemeCheck
     end
 
     def on_include(node)
-      template = node.value.template_name_expr
-      if template.is_a?(String)
-        add_missing_offense("snippets/#{template}", node: node)
+      snippet = node.value.template_name_expr
+      if snippet.is_a?(String)
+        add_missing_offense("snippets/#{snippet}", node: node)
       end
     end
 
     alias_method :on_render, :on_include
 
     def on_section(node)
-      template = node.value.section_name
-      add_missing_offense("sections/#{template}", node: node)
+      section = node.value.section_name
+      add_missing_offense("sections/#{section}", node: node)
     end
 
     private

data/lib/theme_check/checks/nested_snippet.rb

@@ -26,12 +26,12 @@ module ThemeCheck
     end
 
     def on_document(node)
-      @templates[node.template.name] = TemplateInfo.new(Set.new)
+      @templates[node.theme_file.name] = TemplateInfo.new(Set.new)
     end
 
     def on_include(node)
       if node.value.template_name_expr.is_a?(String)
-        @templates[node.template.name].includes << node
+        @templates[node.theme_file.name].includes << node
       end
     end
     alias_method :on_render, :on_include

data/lib/theme_check/checks/required_layout_theme_object.rb

@@ -14,7 +14,7 @@ module ThemeCheck
     end
 
     def on_document(node)
-      @layout_theme_node = node if node.template.name == LAYOUT_FILENAME
+      @layout_theme_node = node if node.theme_file.name == LAYOUT_FILENAME
     end
 
     def on_variable(node)
@@ -25,7 +25,7 @@ module ThemeCheck
     end
 
     def after_document(node)
-      return unless node.template.name == LAYOUT_FILENAME
+      return unless node.theme_file.name == LAYOUT_FILENAME
 
       add_missing_object_offense("content_for_layout") unless @content_for_layout_found
       add_missing_object_offense("content_for_header") unless @content_for_header_found

data/lib/theme_check/checks/syntax_error.rb

@@ -7,23 +7,23 @@ module ThemeCheck
     doc docs_url(__FILE__)
 
     def on_document(node)
-      node.template.warnings.each do |warning|
-        add_exception_as_offense(warning, template: node.template)
+      node.theme_file.warnings.each do |warning|
+        add_exception_as_offense(warning, theme_file: node.theme_file)
       end
     end
 
     def on_error(exception)
-      add_exception_as_offense(exception, template: theme[exception.template_name])
+      add_exception_as_offense(exception, theme_file: theme[exception.template_name])
     end
 
     private
 
-    def add_exception_as_offense(exception, template:)
+    def add_exception_as_offense(exception, theme_file:)
       add_offense(
         exception.to_s(false).sub(/ in ".*"$/, ''),
         line_number: exception.line_number,
         markup: exception.markup_context&.sub(/^in "(.*)"$/, '\1'),
-        template: template,
+        theme_file: theme_file,
       )
     end
   end

data/lib/theme_check/checks/template_length.rb

@@ -29,9 +29,9 @@ module ThemeCheck
     end
 
     def after_document(node)
-      lines = node.template.source.count("\n") - @excluded_lines
+      lines = node.theme_file.source.count("\n") - @excluded_lines
       if lines > @max_length
-        add_offense("Template has too many lines [#{lines}/#{@max_length}]", template: node.template)
+        add_offense("Template has too many lines [#{lines}/#{@max_length}]", theme_file: node.theme_file)
       end
     end
 

data/lib/theme_check/checks/translation_key_exists.rb

@@ -29,7 +29,9 @@ module ThemeCheck
           "'#{key_node.value}' does not have a matching entry in '#{@theme.default_locale_json.relative_path}'",
           node: node,
           markup: key_node.value,
-        )
+        ) do |corrector|
+          corrector.add_default_translation_key(@theme.default_locale_json, key_node.value.split("."), "TODO")
+        end
       end
     end
 

data/lib/theme_check/checks/undefined_object.rb

@@ -62,22 +62,22 @@ module ThemeCheck
 
     def on_document(node)
       return if ignore?(node)
-      @files[node.template.name] = TemplateInfo.new
+      @files[node.theme_file.name] = TemplateInfo.new
     end
 
     def on_assign(node)
       return if ignore?(node)
-      @files[node.template.name].all_assigns[node.value.to] = node
+      @files[node.theme_file.name].all_assigns[node.value.to] = node
     end
 
     def on_capture(node)
       return if ignore?(node)
-      @files[node.template.name].all_captures[node.value.instance_variable_get('@to')] = node
+      @files[node.theme_file.name].all_captures[node.value.instance_variable_get('@to')] = node
     end
 
     def on_for(node)
       return if ignore?(node)
-      @files[node.template.name].all_forloops[node.value.variable_name] = node
+      @files[node.theme_file.name].all_forloops[node.value.variable_name] = node
     end
 
     def on_include(_node)
@@ -90,7 +90,7 @@ module ThemeCheck
       return unless node.value.template_name_expr.is_a?(String)
 
       snippet_name = "snippets/#{node.value.template_name_expr}"
-      @files[node.template.name].add_render(
+      @files[node.theme_file.name].add_render(
         name: snippet_name,
         node: node,
       )
@@ -98,7 +98,7 @@ module ThemeCheck
 
     def on_variable_lookup(node)
       return if ignore?(node)
-      @files[node.template.name].add_variable_lookup(
+      @files[node.theme_file.name].add_variable_lookup(
         name: node.value.name,
         node: node,
       )
@@ -130,7 +130,7 @@ module ThemeCheck
     private
 
     def ignore?(node)
-      @exclude_snippets && node.template.snippet?
+      @exclude_snippets && node.theme_file.snippet?
     end
 
     def each_template