theme-check 0.8.3 → 0.9.0

data/lib/theme_check/html_node.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+require "forwardable"
+
+module ThemeCheck
+  class HtmlNode
+    extend Forwardable
+    attr_reader :template
+
+    def_delegators :@value, :content, :attributes
+
+    def initialize(value, template)
+      @value = value
+      @template = template
+    end
+
+    def literal?
+      @value.name == "text"
+    end
+
+    def children
+      @value.children.map { |child| HtmlNode.new(child, template) }
+    end
+
+    def parent
+      HtmlNode.new(@value.parent, template)
+    end
+
+    def name
+      if @value.name == "#document-fragment"
+        "document"
+      else
+        @value.name
+      end
+    end
+
+    def value
+      if literal?
+        @value.content
+      else
+        @value
+      end
+    end
+
+    def markup
+      @value.to_html
+    end
+
+    def line_number
+      @value.line
+    end
+  end
+end

data/lib/theme_check/html_visitor.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+require "nokogumbo"
+require "forwardable"
+
+module ThemeCheck
+  class HtmlVisitor
+    attr_reader :checks
+
+    def initialize(checks)
+      @checks = checks
+    end
+
+    def visit_template(template)
+      doc = parse(template)
+      visit(HtmlNode.new(doc, template))
+    end
+
+    private
+
+    def parse(template)
+      Nokogiri::HTML5.fragment(template.source)
+    end
+
+    def visit(node)
+      call_checks(:"on_#{node.name}", node)
+      node.children.each { |child| visit(child) }
+      unless node.literal?
+        call_checks(:"after_#{node.name}", node)
+      end
+    end
+
+    def call_checks(method, *args)
+      checks.call(method, *args)
+    end
+  end
+end

data/lib/theme_check/json_file.rb

@@ -38,6 +38,14 @@ module ThemeCheck
       relative_path.sub_ext('').to_s
     end
 
+    def json?
+      true
+    end
+
+    def liquid?
+      false
+    end
+
     private
 
     def load!

data/lib/theme_check/language_server.rb

@@ -9,6 +9,7 @@ require_relative "language_server/completion_helper"
 require_relative "language_server/completion_provider"
 require_relative "language_server/completion_engine"
 require_relative "language_server/document_link_engine"
+require_relative "language_server/diagnostics_tracker"
 
 Dir[__dir__ + "/language_server/completion_providers/*.rb"].each do |file|
   require file

data/lib/theme_check/language_server/completion_providers/filter_completion_provider.rb

@@ -37,6 +37,7 @@ module ThemeCheck
         partial_match = matches(content, NAMED_FILTER).find do |match|
           match.begin(1) <= cursor && cursor < match.end(1) + 1 # including next character
         end
+        return '' if partial_match.nil?
         partial_match[1]
       end
 

data/lib/theme_check/language_server/diagnostics_tracker.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module ThemeCheck
+  module LanguageServer
+    class DiagnosticsTracker
+      def initialize
+        @previously_reported_files = Set.new
+        @single_files_offenses = {}
+        @first_run = true
+      end
+
+      def first_run?
+        @first_run
+      end
+
+      def build_diagnostics(offenses, analyzed_files: nil)
+        reported_files = Set.new
+        new_single_file_offenses = {}
+
+        offenses.group_by(&:template).each do |template, template_offenses|
+          next unless template
+          reported_offenses = template_offenses
+          previous_offenses = @single_files_offenses[template.path]
+          if analyzed_files.nil? || analyzed_files.include?(template.path)
+            # We re-analyzed the file, so we know the template_offenses are update to date.
+            reported_single_file_offenses = reported_offenses.select(&:single_file?)
+            if reported_single_file_offenses.any?
+              new_single_file_offenses[template.path] = reported_single_file_offenses
+            end
+          elsif previous_offenses
+            # Merge in the previous ones, if some
+            reported_offenses |= previous_offenses
+          end
+          yield template.path, reported_offenses
+          reported_files << template.path
+        end
+
+        @single_files_offenses.each do |path, _|
+          # Already reported above, skip
+          next if reported_files.include?(path)
+
+          if analyzed_files.nil? || analyzed_files.include?(path)
+            # We re-analyzed this file, if it was not reported, all offenses in it got fixed
+            yield path, []
+            new_single_file_offenses[path] = nil
+          end
+          # NOTE: No need to re-report previous offenses as LSP should keep them around until
+          # we clear them.
+          reported_files << path
+        end
+
+        # Publish diagnostics with empty array if all issues on a previously reported template
+        # have been fixed.
+        (@previously_reported_files - reported_files).each do |path|
+          yield path, []
+        end
+
+        @previously_reported_files = reported_files
+        @single_files_offenses.merge!(new_single_file_offenses)
+        @first_run = false
+      end
+    end
+  end
+end

data/lib/theme_check/language_server/handler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "benchmark"
 
 module ThemeCheck
   module LanguageServer
@@ -19,7 +20,7 @@ module ThemeCheck
 
       def initialize(server)
         @server = server
-        @previously_reported_files = Set.new
+        @diagnostics_tracker = DiagnosticsTracker.new
       end
 
       def on_initialize(id, params)
@@ -52,6 +53,7 @@ module ThemeCheck
       end
 
       def on_text_document_did_open(_id, params)
+        return unless @diagnostics_tracker.first_run?
         relative_path = relative_path_from_text_document_uri(params)
         @storage.write(relative_path, text_document_text(params))
         analyze_and_send_offenses(text_document_uri(params))
@@ -124,17 +126,32 @@ module ThemeCheck
           ignored_patterns: config.ignored_patterns
         )
         theme = ThemeCheck::Theme.new(storage)
-
-        offenses = analyze(theme, config)
-        log("Found #{theme.all.size} templates, and #{offenses.size} offenses")
-        send_diagnostics(offenses)
-      end
-
-      def analyze(theme, config)
         analyzer = ThemeCheck::Analyzer.new(theme, config.enabled_checks)
-        log("Checking #{config.root}")
-        analyzer.analyze_theme
-        analyzer.offenses
+
+        if @diagnostics_tracker.first_run?
+          # Analyze the full theme on first run
+          log("Checking #{config.root}")
+          offenses = nil
+          time = Benchmark.measure do
+            offenses = analyzer.analyze_theme
+          end
+          log("Found #{offenses.size} offenses in #{format("%0.2f", time.real)}s")
+          send_diagnostics(offenses)
+        else
+          # Analyze selected files
+          relative_path = Pathname.new(@storage.relative_path(absolute_path))
+          file = theme[relative_path]
+          # Skip if not a theme file
+          if file
+            log("Checking #{relative_path}")
+            offenses = nil
+            time = Benchmark.measure do
+              offenses = analyzer.analyze_files([file])
+            end
+            log("Found #{offenses.size} new offenses in #{format("%0.2f", time.real)}s")
+            send_diagnostics(offenses, [absolute_path])
+          end
+        end
       end
 
       def completions(relative_path, line, col)
@@ -145,22 +162,10 @@ module ThemeCheck
         @document_link_engine.document_links(relative_path)
       end
 
-      def send_diagnostics(offenses)
-        reported_files = Set.new
-
-        offenses.group_by(&:template).each do |template, template_offenses|
-          next unless template
-          send_diagnostic(template.path, template_offenses)
-          reported_files << template.path
+      def send_diagnostics(offenses, analyzed_files = nil)
+        @diagnostics_tracker.build_diagnostics(offenses, analyzed_files: analyzed_files) do |path, diagnostic_offenses|
+          send_diagnostic(path, diagnostic_offenses)
         end
-
-        # Publish diagnostics with empty array if all issues on a previously reported template
-        # have been solved.
-        (@previously_reported_files - reported_files).each do |path|
-          send_diagnostic(path, [])
-        end
-
-        @previously_reported_files = reported_files
       end
 
       def send_diagnostic(path, offenses)

data/lib/theme_check/language_server/server.rb

@@ -52,7 +52,7 @@ module ThemeCheck
         response_body = JSON.dump(response)
         log(JSON.pretty_generate(response)) if $DEBUG
 
-        @out.write("Content-Length: #{response_body.size}\r\n")
+        @out.write("Content-Length: #{response_body.bytesize}\r\n")
         @out.write("\r\n")
         @out.write(response_body)
         @out.flush

data/lib/theme_check/liquid_check.rb

@@ -16,9 +16,5 @@ module ThemeCheck
     ATTR = /[a-z0-9-]+/i
     HTML_ATTRIBUTE = /#{ATTR}(?:=#{QUOTED_LIQUID_ATTRIBUTE})?/omix
     HTML_ATTRIBUTES = /(?:#{HTML_ATTRIBUTE}|\s)*/omix
-
-    def add_offense(message, node: nil, template: node&.template, markup: nil, line_number: nil, &block)
-      offenses << Offense.new(check: self, message: message, template: template, node: node, markup: markup, line_number: line_number, correction: block)
-    end
   end
 end

data/lib/theme_check/offense.rb

@@ -114,6 +114,24 @@ module ThemeCheck
       end
     end
 
+    def whole_theme?
+      check.whole_theme?
+    end
+
+    def single_file?
+      check.single_file?
+    end
+
+    def ==(other)
+      other.is_a?(Offense) &&
+        check == other.check &&
+        message == other.message &&
+        template == other.template &&
+        node == other.node &&
+        markup == other.markup &&
+        line_number == other.line_number
+    end
+
     def to_s
       if template
         "#{message} at #{location}"

data/lib/theme_check/template.rb

@@ -32,6 +32,14 @@ module ThemeCheck
       relative_path.sub_ext('').to_s
     end
 
+    def json?
+      false
+    end
+
+    def liquid?
+      true
+    end
+
     def template?
       name.start_with?('templates')
     end

data/lib/theme_check/theme.rb

@@ -52,8 +52,13 @@ module ThemeCheck
       @all ||= json + liquid + assets
     end
 
-    def [](name)
-      all.find { |t| t.name == name }
+    def [](name_or_relative_path)
+      case name_or_relative_path
+      when Pathname
+        all.find { |t| t.relative_path == name_or_relative_path }
+      else
+        all.find { |t| t.name == name_or_relative_path }
+      end
     end
 
     def templates

data/lib/theme_check/version.rb

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

data/lib/theme_check/visitor.rb

@@ -3,14 +3,13 @@ module ThemeCheck
   class Visitor
     attr_reader :checks
 
-    def initialize(checks)
+    def initialize(checks, disabled_checks)
       @checks = checks
+      @disabled_checks = disabled_checks
     end
 
     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)
@@ -35,13 +34,5 @@ module ThemeCheck
     def call_checks(method, *args)
       checks.call(method, *args)
     end
-
-    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.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Marc-André Cournoyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -72,6 +72,7 @@ files:
 - docs/checks/CHECK_DOCS_TEMPLATE.md
 - docs/checks/asset_size_css.md
 - docs/checks/asset_size_javascript.md
+- docs/checks/content_for_header_modification.md
 - docs/checks/convert_include_to_render.md
 - docs/checks/default_locale.md
 - docs/checks/deprecated_filter.md
@@ -84,6 +85,7 @@ files:
 - docs/checks/missing_template.md
 - docs/checks/nested_snippet.md
 - docs/checks/parser_blocking_javascript.md
+- docs/checks/parser_blocking_script_tag.md
 - docs/checks/remote_asset.md
 - docs/checks/required_directories.md
 - docs/checks/required_layout_theme_object.md
@@ -109,6 +111,7 @@ files:
 - lib/theme_check/checks.rb
 - lib/theme_check/checks/asset_size_css.rb
 - lib/theme_check/checks/asset_size_javascript.rb
+- lib/theme_check/checks/content_for_header_modification.rb
 - lib/theme_check/checks/convert_include_to_render.rb
 - lib/theme_check/checks/default_locale.rb
 - lib/theme_check/checks/deprecated_filter.rb
@@ -121,6 +124,7 @@ files:
 - lib/theme_check/checks/missing_template.rb
 - lib/theme_check/checks/nested_snippet.rb
 - lib/theme_check/checks/parser_blocking_javascript.rb
+- lib/theme_check/checks/parser_blocking_script_tag.rb
 - lib/theme_check/checks/remote_asset.rb
 - lib/theme_check/checks/required_directories.rb
 - lib/theme_check/checks/required_layout_theme_object.rb
@@ -143,6 +147,9 @@ files:
 - lib/theme_check/disabled_checks.rb
 - lib/theme_check/exceptions.rb
 - lib/theme_check/file_system_storage.rb
+- lib/theme_check/html_check.rb
+- lib/theme_check/html_node.rb
+- lib/theme_check/html_visitor.rb
 - lib/theme_check/in_memory_storage.rb
 - lib/theme_check/json_check.rb
 - lib/theme_check/json_file.rb
@@ -156,6 +163,7 @@ files:
 - lib/theme_check/language_server/completion_providers/render_snippet_completion_provider.rb
 - lib/theme_check/language_server/completion_providers/tag_completion_provider.rb
 - lib/theme_check/language_server/constants.rb
+- lib/theme_check/language_server/diagnostics_tracker.rb
 - lib/theme_check/language_server/document_link_engine.rb
 - lib/theme_check/language_server/handler.rb
 - lib/theme_check/language_server/protocol.rb