theme-check 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299afef3e63667dca21495d3a3e6246d378b4be98c6b26a7a5f46405e6db80b8
-  data.tar.gz: b4d57dd51b0bd8960fcd42314fea731c1ae0aaac1ca29bbd2c591b3a6a9f4781
+  metadata.gz: b841f4d2f809e07dec57140fd76f373e216f721903baa7ac1dce747b5ce77c82
+  data.tar.gz: b513333c296966cedb4d00345cb7ab1a3d4dcbb305b92b3eb96edc598867bba5
 SHA512:
-  metadata.gz: ea83f67457a564676ca6e32f7b6f601f54c2d6c259cc1a8af705d673640bb9a3e11881f54ca9cc571faf75cb36af93b51c5f03c96547d2cb24eb19ff69d59795
-  data.tar.gz: 2694a73abcb292ebcc6d1f142a9255f9b5126d4748c64ece82c0081acb65d12c194acbd6232f24b50d0ddf982d076f49b342ef833883a09ab9a287712b631af5
+  metadata.gz: 1d75dc49ae97db15d4622d6a59b7a12a0eab0de6a6bcf19e6e8bca3b7f6eb6f94c40c11cfcdb3ac911bbc4d93e6d08cfbb83e85de763d00cb60b6fab10bfc7bb
+  data.tar.gz: eb7c5fdb74551461de7fd643071734dc8b2442db4a5a80492b982bc392c67a100614e4a9fa3b4580e28c5f1b8321564adc8f9580618f3bcdbc36dfd4e4ab13e3

data/CHANGELOG.md

@@ -1,4 +1,14 @@
 
+0.8.1 / 2021-04-22
+==================
+
+  * Add consistent spacing around the pipe character (`|`) in variable expressions to the `SpaceInsideBrace` check ([#73](https://github.com/shopify/theme-check/issues/73))
+  * Add ReCaptcha system translation ([#265](https://github.com/shopify/theme-check/issues/265))
+  * Fix document links in `{% liquid %}` tags ([#263](https://github.com/shopify/theme-check/issues/263))
+  * Fix theme-check-disable for checks based on regular expressions ([#242](https://github.com/shopify/theme-check/issues/242))
+  * Fix VS Code crash on new window ([#264](https://github.com/shopify/theme-check/issues/264))
+  * Rescue errors thrown by remote_asset_file
+
 0.8.0 / 2021-04-13
 ==================
 

data/data/shopify_translation_keys.yml

@@ -848,3 +848,4 @@
 - shopify.store_availability.pick_up_time.two_to_four_hours
 - shopify.store_availability.pick_up_time.immediately
 - shopify.store_availability.pick_up_time.next_day
+- shopify.online_store.spam_detection.disclaimer_html

data/docs/checks/space_inside_braces.md

@@ -17,6 +17,10 @@ This check is aimed at eliminating ugly Liquid:
 <!-- After commas and semicolons -->
 {% form 'type',  object, key:value %}
 {% endform %}
+
+<!-- Arround filter pipelines -->
+{{ url  | asset_url | img_tag }}
+{% assign my_upcase_string = "Hello world"| upcase %}
 ```
 
 :+1: Examples of **correct** code for this check:
@@ -33,6 +37,8 @@ This check is aimed at eliminating ugly Liquid:
   media_size: section.settings.product_recommendations_image_ratio,
   center_align_text: section.settings.center_align_text
 %}
+{{ url | asset_url | img_tag }}
+{% assign my_upcase_string = "Hello world" | upcase %}
 ```
 
 ## Check Options

data/lib/theme_check.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 require "liquid"
 
+require_relative "theme_check/exceptions"
 require_relative "theme_check/analyzer"
 require_relative "theme_check/check"
 require_relative "theme_check/checks_tracking"
 require_relative "theme_check/cli"
+require_relative "theme_check/disabled_check"
 require_relative "theme_check/disabled_checks"
 require_relative "theme_check/liquid_check"
 require_relative "theme_check/locale_diff"
@@ -14,6 +16,8 @@ require_relative "theme_check/regex_helpers"
 require_relative "theme_check/json_check"
 require_relative "theme_check/json_file"
 require_relative "theme_check/json_helpers"
+require_relative "theme_check/position_helper"
+require_relative "theme_check/position"
 require_relative "theme_check/language_server"
 require_relative "theme_check/checks"
 require_relative "theme_check/config"

data/lib/theme_check/analyzer.rb

@@ -1,11 +1,8 @@
 # frozen_string_literal: true
 module ThemeCheck
   class Analyzer
-    attr_reader :offenses
-
     def initialize(theme, checks = Check.all.map(&:new), auto_correct = false)
       @theme = theme
-      @offenses = []
       @auto_correct = auto_correct
 
       @liquid_checks = Checks.new
@@ -13,7 +10,6 @@ module ThemeCheck
 
       checks.each do |check|
         check.theme = @theme
-        check.offenses = @offenses
 
         case check
         when LiquidCheck
@@ -26,26 +22,40 @@ module ThemeCheck
       @visitor = Visitor.new(@liquid_checks)
     end
 
+    def offenses
+      @liquid_checks.flat_map(&:offenses) + @json_checks.flat_map(&:offenses)
+    end
+
+    def offenses_clear!
+      @liquid_checks.each do |check|
+        check.offenses.clear
+      end
+
+      @json_checks.each do |check|
+        check.offenses.clear
+      end
+    end
+
     def analyze_theme
-      @offenses.clear
+      offenses_clear!
       @theme.liquid.each { |template| @visitor.visit_template(template) }
       @theme.json.each { |json_file| @json_checks.call(:on_file, json_file) }
       @liquid_checks.call(:on_end)
       @json_checks.call(:on_end)
-      @offenses
+      offenses
     end
 
     def uncorrectable_offenses
       unless @auto_correct
-        return @offenses
+        return offenses
       end
 
-      @offenses.select { |offense| !offense.correctable? }
+      offenses.select { |offense| !offense.correctable? }
     end
 
     def correct_offenses
       if @auto_correct
-        @offenses.each(&:correct)
+        offenses.each(&:correct)
         @theme.liquid.each(&:write)
       end
     end

data/lib/theme_check/check.rb

@@ -6,8 +6,8 @@ module ThemeCheck
     include JsonHelpers
 
     attr_accessor :theme
-    attr_accessor :offenses
     attr_accessor :options
+    attr_writer :offenses
 
     SEVERITIES = [
       :error,
@@ -69,6 +69,10 @@ module ThemeCheck
       end
     end
 
+    def offenses
+      @offenses ||= []
+    end
+
     def severity
       self.class.severity
     end

data/lib/theme_check/checks.rb

@@ -9,14 +9,8 @@ module ThemeCheck
       end
     end
 
-    def always_enabled
-      self.class.new(reject(&:can_disable?))
-    end
-
-    def except_for(disabled_checks)
-      still_enabled = reject { |check| disabled_checks.all.include?(check.code_name) }
-
-      self.class.new((always_enabled + still_enabled).uniq)
+    def disableable
+      self.class.new(select(&:can_disable?))
     end
   end
 end

data/lib/theme_check/checks/missing_enable_comment.rb

@@ -17,13 +17,13 @@ module ThemeCheck
     end
 
     def after_document(node)
-      return if @disabled_checks.full_document_disabled?
-      return unless @disabled_checks.any?
+      checks_missing_end_index = @disabled_checks.checks_missing_end_index
+      return if checks_missing_end_index.empty?
 
-      message = if @disabled_checks.all_disabled?
+      message = if checks_missing_end_index.any? { |name| name == :all }
         "All checks were"
       else
-        @disabled_checks.all.join(', ') + " " + (@disabled_checks.all.size == 1 ? "was" : "were")
+        checks_missing_end_index.join(', ') + " " + (checks_missing_end_index.size == 1 ? "was" : "were")
       end
 
       add_offense("#{message} disabled but not re-enabled with theme-check-enable", node: node)

data/lib/theme_check/checks/space_inside_braces.rb

@@ -15,12 +15,18 @@ module ThemeCheck
       return if :assign == node.type_name
 
       outside_of_strings(node.markup) do |chunk|
-        chunk.scan(/([,:])  +/) do |_match|
+        chunk.scan(/([,:|])  +/) do |_match|
           add_offense("Too many spaces after '#{Regexp.last_match(1)}'", node: node, markup: Regexp.last_match(0))
         end
-        chunk.scan(/([,:])\S/) do |_match|
+        chunk.scan(/([,:|])\S/) do |_match|
           add_offense("Space missing after '#{Regexp.last_match(1)}'", node: node, markup: Regexp.last_match(0))
         end
+        chunk.scan(/  ([|])+/) do |_match|
+          add_offense("Too many spaces before '#{Regexp.last_match(1)}'", node: node, markup: Regexp.last_match(0))
+        end
+        chunk.scan(/\A(?<pipe>\|)|\S(?<pipe>\|)/) do |_match|
+          add_offense("Space missing before '#{Regexp.last_match(:pipe)}'", node: node, markup: Regexp.last_match(:pipe))
+        end
       end
     end
 

data/lib/theme_check/disabled_check.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# This class keeps track of checks being turned on and off in ranges.
+# We'll use the node position to figure out if the test is disabled or not.
+module ThemeCheck
+  class DisabledCheck
+    attr_reader :name, :ranges
+    attr_accessor :first_line
+
+    def initialize(name)
+      @name = name
+      @ranges = []
+      @first_line = false
+    end
+
+    def start_index=(index)
+      return unless ranges.empty? || !last.end.nil?
+      @ranges << (index..)
+    end
+
+    def end_index=(index)
+      return if ranges.empty? || !last.end.nil?
+      @ranges << (@ranges.pop.begin..index)
+    end
+
+    def disabled?(index)
+      ranges.any? { |range| range.cover?(index) }
+    end
+
+    def last
+      ranges.last
+    end
+
+    def missing_end_index?
+      return false if first_line && ranges.size == 1
+      last.end.nil?
+    end
+  end
+end

data/lib/theme_check/disabled_checks.rb

@@ -8,50 +8,36 @@ module ThemeCheck
 
     ACTION_DISABLE_CHECKS = :disable
     ACTION_ENABLE_CHECKS = :enable
-    ACTION_UNRELATED_COMMENT = :unrelated
 
     def initialize
-      @disabled = []
-      @all_disabled = false
-      @full_document_disabled = false
+      @disabled_checks = {}
     end
 
     def update(node)
       text = comment_text(node)
-
       if start_disabling?(text)
-        @disabled = checks_from_text(text)
-        @all_disabled = @disabled.empty?
-
-        if node&.line_number == 1
-          @full_document_disabled = true
+        checks_from_text(text).each do |check_name|
+          @disabled_checks[check_name] ||= DisabledCheck.new(check_name)
+          @disabled_checks[check_name].start_index = node.start_index
+          @disabled_checks[check_name].first_line = true if node.line_number == 1
         end
       elsif stop_disabling?(text)
-        checks = checks_from_text(text)
-        @disabled = checks.empty? ? [] : @disabled - checks
-
-        @all_disabled = false
+        checks_from_text(text).each do |check_name|
+          next unless @disabled_checks.key?(check_name)
+          @disabled_checks[check_name].end_index = node.end_index
+        end
       end
     end
 
-    # Whether any checks are currently disabled
-    def any?
-      !@disabled.empty? || @all_disabled
-    end
-
-    # Whether all checks should be disabled
-    def all_disabled?
-      @all_disabled
-    end
-
-    # Get a list of all the individual disabled checks
-    def all
-      @disabled
+    def disabled?(key, index)
+      @disabled_checks[:all]&.disabled?(index) ||
+        @disabled_checks[key]&.disabled?(index)
     end
 
-    # If the first line of the document is a theme-check-disable comment
-    def full_document_disabled?
-      @full_document_disabled
+    def checks_missing_end_index
+      @disabled_checks.values
+        .select(&:missing_end_index?)
+        .map(&:name)
     end
 
     private
@@ -69,9 +55,11 @@ module ThemeCheck
     end
 
     # Return a list of checks from a theme-check-disable comment
-    # Returns [] if all checks are meant to be disabled
+    # Returns [:all] if all checks are meant to be disabled
     def checks_from_text(text)
-      text.gsub(DISABLE_PREFIX_PATTERN, '').strip.split(',').map(&:strip)
+      checks = text.gsub(DISABLE_PREFIX_PATTERN, '').strip.split(',').map(&:strip)
+      return [:all] if checks.empty?
+      checks
     end
   end
 end

data/lib/theme_check/exceptions.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+require "net/http"
+
+TIMEOUT_EXCEPTIONS = [
+  Net::ReadTimeout,
+  Net::OpenTimeout,
+  Net::WriteTimeout,
+  Errno::ETIMEDOUT,
+  Timeout::Error,
+]
+
+CONNECTION_EXCEPTIONS = [
+  IOError,
+  EOFError,
+  SocketError,
+  Errno::EINVAL,
+  Errno::ECONNRESET,
+  Errno::ECONNABORTED,
+  Errno::EPIPE,
+  Errno::ECONNREFUSED,
+  Errno::EAGAIN,
+  Errno::EHOSTUNREACH,
+  Errno::ENETUNREACH,
+]
+
+NET_HTTP_EXCEPTIONS = [
+  Net::HTTPBadResponse,
+  Net::HTTPHeaderSyntaxError,
+  Net::ProtocolError,
+  *TIMEOUT_EXCEPTIONS,
+  *CONNECTION_EXCEPTIONS,
+]

data/lib/theme_check/json_file.rb

@@ -20,6 +20,10 @@ module ThemeCheck
       @relative_pathname ||= Pathname.new(@relative_path)
     end
 
+    def source
+      @source ||= @storage.read(@relative_path)
+    end
+
     def content
       load!
       @content
@@ -39,7 +43,7 @@ module ThemeCheck
     def load!
       return if @loaded
 
-      @content = JSON.parse(@storage.read(@relative_path))
+      @content = JSON.parse(source)
     rescue JSON::ParserError => e
       @parser_error = e
     ensure

data/lib/theme_check/language_server.rb

@@ -4,7 +4,6 @@ require_relative "language_server/constants"
 require_relative "language_server/handler"
 require_relative "language_server/server"
 require_relative "language_server/tokens"
-require_relative "language_server/position_helper"
 require_relative "language_server/completion_helper"
 require_relative "language_server/completion_provider"
 require_relative "language_server/completion_engine"

data/lib/theme_check/language_server/completion_engine.rb

@@ -12,7 +12,7 @@ module ThemeCheck
 
       def completions(relative_path, line, col)
         buffer = @storage.read(relative_path)
-        cursor = from_line_column_to_index(buffer, line, col)
+        cursor = from_row_column_to_index(buffer, line, col)
         token = find_token(buffer, cursor)
         return [] if token.nil?
 

data/lib/theme_check/language_server/constants.rb

@@ -4,7 +4,11 @@ module ThemeCheck
   module LanguageServer
     PARTIAL_RENDER = %r{
       \{\%-?\s*render\s+'(?<partial>[^']*)'|
-      \{\%-?\s*render\s+"(?<partial>[^"]*)"
+      \{\%-?\s*render\s+"(?<partial>[^"]*)"|
+
+      # in liquid tags the whole line is white space until render
+      ^\s*render\s+'(?<partial>[^']*)'|
+      ^\s*render\s+"(?<partial>[^"]*)"
     }mix
   end
 end

data/lib/theme_check/language_server/document_link_engine.rb

@@ -14,12 +14,12 @@ module ThemeCheck
         buffer = @storage.read(relative_path)
         return [] unless buffer
         matches(buffer, PARTIAL_RENDER).map do |match|
-          start_line, start_character = from_index_to_line_column(
+          start_line, start_character = from_index_to_row_column(
             buffer,
             match.begin(:partial),
           )
 
-          end_line, end_character = from_index_to_line_column(
+          end_line, end_character = from_index_to_row_column(
             buffer,
             match.end(:partial)
           )

data/lib/theme_check/language_server/handler.rb

@@ -23,17 +23,17 @@ module ThemeCheck
       end
 
       def on_initialize(id, params)
-        @root_path = params["rootPath"]
+        @root_path = path_from_uri(params["rootUri"]) || params["rootPath"]
+
+        # Tell the client we don't support anything if there's no rootPath
+        return send_response(id, { capabilities: {} }) if @root_path.nil?
         @storage = in_memory_storage(@root_path)
         @completion_engine = CompletionEngine.new(@storage)
         @document_link_engine = DocumentLinkEngine.new(@storage)
         # https://microsoft.github.io/language-server-protocol/specifications/specification-current/#responseMessage
-        send_response(
-          id: id,
-          result: {
-            capabilities: CAPABILITIES,
-          }
-        )
+        send_response(id, {
+          capabilities: CAPABILITIES,
+        })
       end
 
       def on_exit(_id, _params)
@@ -63,20 +63,14 @@ module ThemeCheck
 
       def on_text_document_document_link(id, params)
         relative_path = relative_path_from_text_document_uri(params)
-        send_response(
-          id: id,
-          result: document_links(relative_path)
-        )
+        send_response(id, document_links(relative_path))
       end
 
       def on_text_document_completion(id, params)
         relative_path = relative_path_from_text_document_uri(params)
         line = params.dig('position', 'line')
         col = params.dig('position', 'character')
-        send_response(
-          id: id,
-          result: completions(relative_path, line, col)
-        )
+        send_response(id, completions(relative_path, line, col))
       end
 
       private
@@ -99,7 +93,11 @@ module ThemeCheck
       end
 
       def text_document_uri(params)
-        params.dig('textDocument', 'uri').sub('file://', '')
+        path_from_uri(params.dig('textDocument', 'uri'))
+      end
+
+      def path_from_uri(uri)
+        uri&.sub('file://', '')
       end
 
       def relative_path_from_text_document_uri(params)
@@ -167,13 +165,10 @@ module ThemeCheck
 
       def send_diagnostic(path, offenses)
         # https://microsoft.github.io/language-server-protocol/specifications/specification-current/#notificationMessage
-        send_response(
-          method: 'textDocument/publishDiagnostics',
-          params: {
-            uri: "file://#{path}",
-            diagnostics: offenses.map { |offense| offense_to_diagnostic(offense) },
-          },
-        )
+        send_notification('textDocument/publishDiagnostics', {
+          uri: "file://#{path}",
+          diagnostics: offenses.map { |offense| offense_to_diagnostic(offense) },
+        })
       end
 
       def offense_to_diagnostic(offense)
@@ -220,11 +215,24 @@ module ThemeCheck
         }
       end
 
-      def send_response(message)
+      def send_message(message)
         message[:jsonrpc] = '2.0'
         @server.send_response(message)
       end
 
+      def send_response(id, result = nil, error = nil)
+        message = { id: id }
+        message[:result] = result if result
+        message[:error] = error if error
+        send_message(message)
+      end
+
+      def send_notification(method, params)
+        message = { method: method }
+        message[:params] = params
+        send_message(message)
+      end
+
       def log(message)
         @server.log(message)
       end

data/lib/theme_check/node.rb

@@ -125,5 +125,17 @@ module ThemeCheck
       start = template.full_line(line_number).index(markup)
       [start, start + markup.length - 1]
     end
+
+    def position
+      @position ||= Position.new(markup, template&.source, line_number)
+    end
+
+    def start_index
+      position.start_index
+    end
+
+    def end_index
+      position.end_index
+    end
   end
 end

data/lib/theme_check/offense.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 module ThemeCheck
-  Position = Struct.new(:line, :column)
-
   class Offense
     MAX_SOURCE_EXCERPT_SIZE = 120
 
@@ -20,6 +18,7 @@ module ThemeCheck
       end
 
       @node = node
+      @template = nil
       if node
         @template = node.template
       elsif template
@@ -40,8 +39,7 @@ module ThemeCheck
         @node.line_number
       end
 
-      @start_position = nil
-      @end_position = nil
+      @position = Position.new(@markup, @template&.source, @line_number)
     end
 
     def source_excerpt
@@ -56,20 +54,28 @@ module ThemeCheck
       end
     end
 
+    def start_index
+      @position.start_index
+    end
+
     def start_line
-      start_position.line
+      @position.start_row
     end
 
     def start_column
-      start_position.column
+      @position.start_column
+    end
+
+    def end_index
+      @position.end_index
     end
 
     def end_line
-      end_position.line
+      @position.end_row
     end
 
     def end_column
-      end_position.column
+      @position.end_column
     end
 
     def code_name
@@ -115,45 +121,5 @@ module ThemeCheck
         message
       end
     end
-
-    private
-
-    def full_line(line)
-      # Liquid::Template is 1-indexed.
-      template.full_line(line + 1)
-    end
-
-    def lines_of_content
-      @lines ||= markup.lines.map { |x| x.sub(/\n$/, '') }
-    end
-
-    # 0-indexed, inclusive
-    def start_position
-      return @start_position if @start_position
-      return @start_position = Position.new(0, 0) unless line_number && markup
-
-      position = Position.new
-      position.line = line_number - 1
-      position.column = full_line(position.line).index(lines_of_content.first) || 0
-
-      @start_position = position
-    end
-
-    # 0-indexed, exclusive. It's the line + col that are exclusive.
-    # This is why it doesn't make sense to calculate them separately.
-    def end_position
-      return @end_position if @end_position
-      return @end_position = Position.new(0, 0) unless line_number && markup
-
-      position = Position.new
-      position.line = start_line + lines_of_content.size - 1
-      position.column = if start_line == position.line
-        start_column + markup.size
-      else
-        lines_of_content.last.size
-      end
-
-      @end_position = position
-    end
   end
 end

data/lib/theme_check/position.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module ThemeCheck
+  class Position
+    include PositionHelper
+
+    def initialize(needle, contents, line_number_1_indexed)
+      @needle = needle
+      @contents = contents
+      @line_number_1_indexed = line_number_1_indexed
+      @start_row_column = nil
+      @end_row_column = nil
+    end
+
+    def start_line_index
+      from_row_column_to_index(contents, line_number, 0)
+    end
+
+    # 0-indexed, inclusive
+    def start_index
+      contents.index(needle, start_line_index) || start_line_index
+    end
+
+    # 0-indexed, exclusive
+    def end_index
+      start_index + needle.size
+    end
+
+    def start_row
+      start_row_column[0]
+    end
+
+    def start_column
+      start_row_column[1]
+    end
+
+    def end_row
+      end_row_column[0]
+    end
+
+    def end_column
+      end_row_column[1]
+    end
+
+    private
+
+    def contents
+      return '' unless @contents.is_a?(String) && !@contents.empty?
+      @contents
+    end
+
+    def line_number
+      return 0 if @line_number_1_indexed.nil?
+      bounded(0, @line_number_1_indexed - 1, contents.lines.size - 1)
+    end
+
+    def needle
+      if @needle.nil? && !contents.empty? && !@line_number_1_indexed.nil?
+        contents.lines(chomp: true)[line_number] || ''
+      elsif contents.empty? || @needle.nil?
+        ''
+      else
+        @needle
+      end
+    end
+
+    def start_row_column
+      return @start_row_column unless @start_row_column.nil?
+      @start_row_column = from_index_to_row_column(contents, start_index)
+    end
+
+    def end_row_column
+      return @end_row_column unless @end_row_column.nil?
+      @end_row_column = from_index_to_row_column(contents, end_index)
+    end
+  end
+end

data/lib/theme_check/position_helper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+# Note: Everything is 0-indexed here.
+
+module ThemeCheck
+  module PositionHelper
+    def from_row_column_to_index(content, row, col)
+      return 0 unless content.is_a?(String) && !content.empty?
+      return 0 unless row.is_a?(Integer) && col.is_a?(Integer)
+      i = 0
+      result = 0
+      safe_row = bounded(0, row, content.lines.size - 1)
+      lines = content.lines
+      line_size = lines[i].size
+      while i < safe_row
+        result += line_size
+        i += 1
+        line_size = lines[i].size
+      end
+      result += bounded(0, col, line_size - 1)
+      result
+    end
+
+    def from_index_to_row_column(content, index)
+      return [0, 0] unless content.is_a?(String) && !content.empty?
+      return [0, 0] unless index.is_a?(Integer)
+      safe_index = bounded(0, index, content.size - 1)
+      lines = content[0..safe_index].lines
+      row = lines.size - 1
+      col = lines.last.size - 1
+      [row, col]
+    end
+
+    def bounded(a, x, b)
+      [a, [x, b].min].max
+    end
+  end
+end

data/lib/theme_check/remote_asset_file.rb

@@ -35,6 +35,9 @@ module ThemeCheck
       end
 
       @content = res.body
+
+    rescue OpenSSL::SSL::SSLError, Zlib::StreamError, *NET_HTTP_EXCEPTIONS
+      @contents = ''
     end
 
     def gzipped_size

data/lib/theme_check/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ThemeCheck
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/lib/theme_check/visitor.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module ThemeCheck
   class Visitor
+    attr_reader :checks
+
     def initialize(checks)
       @checks = checks
     end
@@ -8,6 +10,7 @@ module ThemeCheck
     def visit_template(template)
       @disabled_checks = DisabledChecks.new
       visit(Node.new(template.root, nil, template))
+      remove_disabled_offenses
     rescue Liquid::Error => exception
       exception.template_name = template.name
       call_checks(:on_error, exception)
@@ -29,20 +32,16 @@ module ThemeCheck
       @disabled_checks.update(node) if node.comment?
     end
 
-    def visit_children(node)
-      node.children.each { |child| visit(child) }
-    end
-
     def call_checks(method, *args)
       checks.call(method, *args)
     end
 
-    def checks
-      return @checks unless @disabled_checks.any?
-
-      return @checks.always_enabled if @disabled_checks.all_disabled?
-
-      @checks.except_for(@disabled_checks)
+    def remove_disabled_offenses
+      checks.disableable.each do |check|
+        check.offenses.reject! do |offense|
+          @disabled_checks.disabled?(offense.code_name, offense.start_index)
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-check
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Marc-André Cournoyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -138,7 +138,9 @@ files:
 - lib/theme_check/cli.rb
 - lib/theme_check/config.rb
 - lib/theme_check/corrector.rb
+- lib/theme_check/disabled_check.rb
 - lib/theme_check/disabled_checks.rb
+- lib/theme_check/exceptions.rb
 - lib/theme_check/file_system_storage.rb
 - lib/theme_check/in_memory_storage.rb
 - lib/theme_check/json_check.rb
@@ -155,7 +157,6 @@ files:
 - lib/theme_check/language_server/constants.rb
 - lib/theme_check/language_server/document_link_engine.rb
 - lib/theme_check/language_server/handler.rb
-- lib/theme_check/language_server/position_helper.rb
 - lib/theme_check/language_server/protocol.rb
 - lib/theme_check/language_server/server.rb
 - lib/theme_check/language_server/tokens.rb
@@ -165,6 +166,8 @@ files:
 - lib/theme_check/offense.rb
 - lib/theme_check/packager.rb
 - lib/theme_check/parsing_helpers.rb
+- lib/theme_check/position.rb
+- lib/theme_check/position_helper.rb
 - lib/theme_check/printer.rb
 - lib/theme_check/regex_helpers.rb
 - lib/theme_check/releaser.rb

data/lib/theme_check/language_server/position_helper.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-# Note: Everything is 0-indexed here.
-
-module ThemeCheck
-  module LanguageServer
-    module PositionHelper
-      def from_line_column_to_index(content, row, col)
-        i = 0
-        result = 0
-        lines = content.lines
-        while i < row
-          result += lines[i].size
-          i += 1
-        end
-        result += col
-        result
-      end
-
-      def from_index_to_line_column(content, index)
-        lines = content[0..index].lines
-        row = lines.size - 1
-        col = lines.last.size - 1
-        [row, col]
-      end
-    end
-  end
-end