theme-check 1.10.3 → 1.11.0

data/lib/theme_check/language_server/server.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
+
 require 'json'
 require 'stringio'
+require 'timeout'
 
 module ThemeCheck
   module LanguageServer
@@ -45,10 +47,29 @@ module ThemeCheck
       def listen
         start_handler_threads
         start_json_rpc_thread
-        status_code = status_code_from_error(@error.pop)
+        err = @error.pop
+        status_code = status_code_from_error(err)
+
+        if status_code > 0
+          # For a reason I can't comprehend, this hangs but prints
+          # anyway. So it's wrapped in this ugly timeout...
+          Timeout.timeout(1) do
+            $stderr.puts err.full_message
+          end
+
+          # Warn user of error, otherwise server might restart
+          # without telling you.
+          @bridge.send_notification("window/showMessage", {
+            type: 1,
+            message: "A theme-check-language-server error has occurred, search OUTPUT logs for details.",
+          })
+        end
+
         cleanup(status_code)
       rescue SignalException
         0
+      rescue StandardError
+        2
       end
 
       def start_json_rpc_thread
@@ -65,36 +86,43 @@ module ThemeCheck
             else
               @queue << message
             end
-          rescue Exception => e # rubocop:disable Lint/RescueException
-            break @error << e
           end
+        rescue Exception => e # rubocop:disable Lint/RescueException
+          @bridge.log("rescuing #{e.class} in jsonrpc thread")
+          @error << e
         end
       end
 
       def start_handler_threads
         @number_of_threads.times do
           @handlers << Thread.new do
-            loop do
-              message = @queue.pop
-              break if @queue.closed? && @queue.empty?
-              handle_message(message)
-            rescue Exception => e # rubocop:disable Lint/RescueException
-              break @error << e
-            end
+            handle_messages
           end
         end
       end
 
+      def handle_messages
+        loop do
+          message = @queue.pop
+          return if @queue.closed? && @queue.empty?
+
+          handle_message(message)
+        end
+      rescue Exception => e # rubocop:disable Lint/RescueException
+        @bridge.log("rescuing #{e.class} in handler thread")
+        @error << e
+      end
+
       def status_code_from_error(e)
         raise e
 
       # support ctrl+c and stuff
       rescue SignalException, DoneStreaming
         0
-
       rescue Exception => e # rubocop:disable Lint/RescueException
         raise e if should_raise_errors
-        @bridge.log("#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}")
+
+        @bridge.log("Fatal #{e.class}")
         2
       end
 
@@ -109,15 +137,14 @@ module ThemeCheck
         if @handler.respond_to?(method_name)
           @handler.send(method_name, id, params)
         end
-
       rescue DoneStreaming => e
         raise e
       rescue StandardError => e
         is_request = id
         raise e unless is_request
+
         # Errors obtained in request handlers should be sent
         # back as internal errors instead of closing the program.
-        @bridge.log("#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}")
         @bridge.send_internal_error(id, e)
       end
 
@@ -132,6 +159,7 @@ module ThemeCheck
       end
 
       def cleanup(status_code)
+        @bridge.log("Closing server... status code = #{status_code}")
         # Stop listenting to RPC calls
         @messenger.close_input
         # Wait for rpc loop to close

data/lib/theme_check/language_server/versioned_in_memory_storage.rb

@@ -8,7 +8,7 @@ module ThemeCheck
 
     def initialize(files, root = "/dev/null")
       super(files, root)
-      @versions = {}
+      @versions = {} # Hash<relative_path, number>
       @mutex = Mutex.new
     end
 
@@ -49,7 +49,11 @@ module ThemeCheck
     #   - Only offer fixes on "clean" files (or offer the change but specify the version so the editor knows what to do with it)
     def write(relative_path, content, version)
       @mutex.synchronize do
-        @versions[relative_path] = version
+        if version.nil?
+          @versions.delete(relative_path)
+        else
+          @versions[relative_path] = version
+        end
         super(relative_path, content)
       end
     end
@@ -58,6 +62,13 @@ module ThemeCheck
       @mutex.synchronize { [read(relative_path), version(relative_path)] }
     end
 
+    def remove(relative_path)
+      @mutex.synchronize do
+        @versions.delete(relative_path)
+        super(relative_path)
+      end
+    end
+
     def versioned?
       true
     end
@@ -65,5 +76,9 @@ module ThemeCheck
     def version(relative_path)
       @versions[relative_path.to_s]
     end
+
+    def opened_files
+      @versions.keys
+    end
   end
 end

data/lib/theme_check/liquid_file.rb

@@ -33,7 +33,22 @@ module ThemeCheck
 
     def source_excerpt(line)
       original_lines = source.split("\n")
-      original_lines[line - 1].strip
+      original_lines[bounded(0, line - 1, original_lines.size - 1)].strip
+    rescue => e
+      ThemeCheck.bug(<<~EOS)
+        Exception while running `source_excerpt(#{line})`:
+        ```
+        #{e.class}: #{e.message}
+          #{e.backtrace.join("\n  ")}
+        ```
+
+        path: #{path}
+
+        source:
+        ```
+        #{source}
+        ```
+      EOS
     end
 
     def parse
@@ -57,5 +72,11 @@ module ThemeCheck
         disable_liquid_c_nodes: true,
       )
     end
+
+    private
+
+    def bounded(lower, x, upper)
+      [lower, [x, upper].min].max
+    end
   end
 end

data/lib/theme_check/liquid_node.rb

@@ -7,6 +7,7 @@ module ThemeCheck
 
     def initialize(value, parent, theme_file)
       raise ArgumentError, "Expected a Liquid AST Node" if value.is_a?(LiquidNode)
+
       @value = value
       @parent = parent
       @theme_file = theme_file
@@ -37,7 +38,9 @@ module ThemeCheck
             node
           end
         end
-        nodes.map { |node| LiquidNode.new(node, self, @theme_file) }
+        nodes
+          .reject(&:nil?) # We don't want nil nodes, and they can happen
+          .map { |node| LiquidNode.new(node, self, @theme_file) }
       end
     end
 
@@ -75,11 +78,13 @@ module ThemeCheck
 
     def inner_markup
       return '' unless block?
+
       @inner_markup ||= source[block_start_end_index...block_end_start_index]
     end
 
     def inner_json
       return nil unless schema?
+
       @inner_json ||= JSON.parse(inner_markup)
     rescue JSON::ParserError
       # Handled by ValidSchema
@@ -153,6 +158,11 @@ module ThemeCheck
       @value.is_a?(Liquid::Comment)
     end
 
+    # {% # comment %}
+    def inline_comment?
+      @value.is_a?(Liquid::InlineComment)
+    end
+
     # Top level node of every liquid_file.
     def document?
       @value.is_a?(Liquid::Document)
@@ -186,6 +196,7 @@ module ThemeCheck
 
     def filters
       raise TypeError, "Attempting to lookup filters of #{type_name}. Only variables have filters." unless variable?
+
       @value.filters
     end
 
@@ -193,6 +204,25 @@ module ThemeCheck
       theme_file&.source
     end
 
+    # For debugging purposes, this might be easier for the eyes.
+    def to_h
+      if literal?
+        return @value
+      elsif variable_lookup?
+        return {
+          type_name: type_name,
+          name: value.name.to_s,
+          lookups: children.map(&:to_h),
+        }
+      end
+
+      {
+        type_name: type_name,
+        markup: outer_markup,
+        children: children.map(&:to_h),
+      }
+    end
+
     def block_start_markup
       source[block_start_start_index...block_start_end_index]
     end
@@ -217,11 +247,13 @@ module ThemeCheck
 
     def block_end_start_index
       return block_start_end_index unless tag? && block?
+
       @block_end_start_index ||= block_end_match&.begin(0) || block_start_end_index
     end
 
     def block_end_end_index
       return block_end_start_index unless tag? && block?
+
       @block_end_end_index ||= block_end_match&.end(0) || block_start_end_index
     end
 

data/lib/theme_check/liquid_visitor.rb

@@ -28,7 +28,7 @@ module ThemeCheck
         call_checks(:after_node, node)
       end
 
-      @disabled_checks.update(node) if node.comment?
+      @disabled_checks.update(node) if node.comment? || node.inline_comment?
     end
 
     def call_checks(method, *args)

data/lib/theme_check/schema_helper.rb

@@ -8,7 +8,7 @@ module ThemeCheck
       path.each_with_index.reduce(hash) do |pointer, (token, index)|
         if index == path.size - 1
           pointer[token] = value
-        elsif !pointer.key?(token)
+        elsif !pointer.key?(token) || !pointer[token].is_a?(Hash)
           pointer[token] = {}
         end
         pointer[token]

data/lib/theme_check/tags.rb

@@ -145,7 +145,7 @@ module ThemeCheck
 
       disable_tags "include"
 
-      attr_reader :template_name_expr, :attributes
+      attr_reader :template_name_expr, :variable_name_expr, :attributes
 
       def initialize(tag_name, markup, options)
         super
@@ -171,6 +171,7 @@ module ThemeCheck
         def children
           [
             @node.template_name_expr,
+            @node.variable_name_expr,
           ] + @node.attributes.values
         end
       end

data/lib/theme_check/version.rb

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

data/theme-check.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Shopify/theme-check"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency('liquid', '>= 5.1.0')
+  spec.add_dependency('liquid', '>= 5.4.0')
   spec.add_dependency('nokogiri', '>= 1.12')
   spec.add_dependency('parser', '~> 3')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-check
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.11.0
 platform: ruby
 authors:
 - Marc-André Cournoyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -61,7 +61,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/probots.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/workflows/cla.yml"
 - ".github/workflows/theme-check.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -93,6 +95,7 @@ files:
 - docs/api/liquid_check.md
 - docs/checks/TEMPLATE.md.erb
 - docs/checks/app_block_valid_tags.md
+- docs/checks/asset_preload.md
 - docs/checks/asset_size_app_block_css.md
 - docs/checks/asset_size_app_block_javascript.md
 - docs/checks/asset_size_css.md
@@ -153,6 +156,7 @@ files:
 - lib/theme_check/checks.rb
 - lib/theme_check/checks/TEMPLATE.rb.erb
 - lib/theme_check/checks/app_block_valid_tags.rb
+- lib/theme_check/checks/asset_preload.rb
 - lib/theme_check/checks/asset_size_app_block_css.rb
 - lib/theme_check/checks/asset_size_app_block_javascript.rb
 - lib/theme_check/checks/asset_size_css.rb
@@ -294,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/probots.yml

@@ -1,3 +0,0 @@
-# .github/probots.yml
-enabled:
-  - cla