theme-check 1.6.1 → 1.7.2

data/lib/theme_check/offense.rb

@@ -5,13 +5,13 @@ module ThemeCheck
 
     MAX_SOURCE_EXCERPT_SIZE = 120
 
-    attr_reader :check, :message, :template, :node, :markup, :line_number, :correction
+    attr_reader :check, :message, :theme_file, :node, :markup, :line_number, :correction
 
     def initialize(
       check:, # instance of a ThemeCheck::Check
       message: nil, # error message for the offense
-      template: nil, # Template
-      node: nil, # Node or HtmlNode
+      theme_file: nil, # ThemeFile
+      node: nil, # Node
       markup: nil, # string
       line_number: nil, # line number of the error (1-indexed)
       # node_markup_offset is the index inside node.markup to start
@@ -39,11 +39,11 @@ module ThemeCheck
       end
 
       @node = node
-      @template = nil
+      @theme_file = nil
       if node
-        @template = node.template
-      elsif template
-        @template = template
+        @theme_file = node.theme_file
+      elsif theme_file
+        @theme_file = theme_file
       end
 
       @markup = if markup
@@ -62,7 +62,7 @@ module ThemeCheck
 
       @position = Position.new(
         @markup,
-        @template&.source,
+        @theme_file&.source,
         line_number_1_indexed: @line_number,
         node_markup_offset: node_markup_offset,
         node_markup: node&.markup
@@ -72,7 +72,7 @@ module ThemeCheck
     def source_excerpt
       return unless line_number
       @source_excerpt ||= begin
-        excerpt = template.source_excerpt(line_number)
+        excerpt = theme_file.source_excerpt(line_number)
         if excerpt.size > MAX_SOURCE_EXCERPT_SIZE
           excerpt[0, MAX_SOURCE_EXCERPT_SIZE - 3] + '...'
         else
@@ -126,12 +126,12 @@ module ThemeCheck
     end
 
     def location
-      tokens = [template&.relative_path, line_number].compact
+      tokens = [theme_file&.relative_path, line_number].compact
       tokens.join(":") if tokens.any?
     end
 
     def location_range
-      tokens = [template&.relative_path, start_index, end_index].compact
+      tokens = [theme_file&.relative_path, start_index, end_index].compact
       tokens.join(":") if tokens.any?
     end
 
@@ -141,7 +141,7 @@ module ThemeCheck
 
     def correct
       if correctable?
-        corrector = Corrector.new(template: template)
+        corrector = Corrector.new(theme_file: theme_file)
         correction.call(corrector)
       end
     rescue => e
@@ -191,7 +191,7 @@ module ThemeCheck
     alias_method :eql?, :==
 
     def to_s
-      if template
+      if theme_file
         "#{message} at #{location}"
       else
         message
@@ -199,7 +199,7 @@ module ThemeCheck
     end
 
     def to_s_range
-      if template
+      if theme_file
         "#{message} at #{location_range}"
       else
         message
@@ -209,7 +209,7 @@ module ThemeCheck
     def to_h
       {
         check: check.code_name,
-        path: template&.relative_path,
+        path: theme_file&.relative_path,
         severity: check.severity_value,
         start_line: start_line,
         start_column: start_column,

data/lib/theme_check/position.rb

@@ -104,7 +104,7 @@ module ThemeCheck
     end
 
     def can_find_needle?
-      !!contents.index(@needle)
+      !!contents.index(@needle, start_offset)
     end
 
     def entire_line_needle

data/lib/theme_check/shopify_liquid/system_translations.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module ThemeCheck
+  module ShopifyLiquid
+    module SystemTranslations
+      extend self
+
+      def translations
+        @translations ||= YAML.load(File.read("#{__dir__}/../../../data/shopify_translation_keys.yml")).to_set
+      end
+
+      def translations_hash
+        @translations_hash ||= translations.reduce({}) do |acc, k|
+          dig_set(acc, k.split('.'), "")
+        end
+      end
+
+      def include?(key)
+        translations.include?(key)
+      end
+
+      private
+
+      def dig_set(obj, keys, value)
+        key = keys.first
+        if keys.length == 1
+          obj[key] = value
+        else
+          obj[key] = {} unless obj[key]
+          dig_set(obj[key], keys.slice(1..-1), value)
+        end
+        obj
+      end
+    end
+  end
+end

data/lib/theme_check/shopify_liquid/tag.rb

@@ -7,10 +7,17 @@ module ThemeCheck
       extend self
 
       def labels
-        @tags ||= YAML.load(File.read("#{__dir__}/../../../data/shopify_liquid/tags.yml"))
+        @labels ||= tags_file_contents
+          .map { |x| to_label(x) }
           .to_set
       end
 
+      def end_labels
+        @end_labels ||= tags_file_contents
+          .select { |x| x.is_a?(Hash) }
+          .map { |x| x.values[0] }
+      end
+
       def tag_regex(tag)
         return unless labels.include?(tag)
         @tag_regexes ||= {}
@@ -22,6 +29,17 @@ module ThemeCheck
         @tag_liquid_regexes ||= {}
         @tag_liquid_regexes[tag] ||= /^\s*#{tag}/m
       end
+
+      private
+
+      def to_label(label)
+        return label if label.is_a?(String)
+        label.keys[0]
+      end
+
+      def tags_file_contents
+        @tags_file_contents ||= YAML.load(File.read("#{__dir__}/../../../data/shopify_liquid/tags.yml"))
+      end
     end
   end
 end

data/lib/theme_check/shopify_liquid.rb

@@ -3,3 +3,4 @@ require_relative 'shopify_liquid/deprecated_filter'
 require_relative 'shopify_liquid/filter'
 require_relative 'shopify_liquid/object'
 require_relative 'shopify_liquid/tag'
+require_relative 'shopify_liquid/system_translations'

data/lib/theme_check/theme.rb

@@ -23,7 +23,7 @@ module ThemeCheck
     def liquid
       @liquid ||= @storage.files
         .select { |path| LIQUID_REGEX.match?(path) }
-        .map { |path| Template.new(path, @storage) }
+        .map { |path| LiquidFile.new(path, @storage) }
     end
 
     def json

data/lib/theme_check/{template_rewriter.rb → theme_file_rewriter.rb}

@@ -3,7 +3,7 @@
 require 'parser'
 
 module ThemeCheck
-  class TemplateRewriter
+  class ThemeFileRewriter
     def initialize(name, source)
       @buffer = Parser::Source::Buffer.new(name, source: source)
       @rewriter = Parser::Source::TreeRewriter.new(

data/lib/theme_check/version.rb

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

data/lib/theme_check.rb

@@ -4,20 +4,23 @@ require "liquid"
 require_relative "theme_check/version"
 require_relative "theme_check/bug"
 require_relative "theme_check/exceptions"
+require_relative "theme_check/theme_file_rewriter"
 require_relative "theme_check/theme_file"
+require_relative "theme_check/liquid_file"
+require_relative "theme_check/asset_file"
+require_relative "theme_check/json_file"
 require_relative "theme_check/analyzer"
 require_relative "theme_check/check"
 require_relative "theme_check/checks_tracking"
+require_relative "theme_check/liquid_check"
+require_relative "theme_check/html_check"
+require_relative "theme_check/json_check"
 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"
-require_relative "theme_check/asset_file"
 require_relative "theme_check/remote_asset_file"
 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"
@@ -25,23 +28,21 @@ require_relative "theme_check/language_server"
 require_relative "theme_check/checks"
 require_relative "theme_check/config"
 require_relative "theme_check/node"
+require_relative "theme_check/liquid_node"
+require_relative "theme_check/html_node"
 require_relative "theme_check/offense"
 require_relative "theme_check/printer"
 require_relative "theme_check/json_printer"
 require_relative "theme_check/shopify_liquid"
-require_relative "theme_check/storage"
 require_relative "theme_check/string_helpers"
+require_relative "theme_check/storage"
 require_relative "theme_check/file_system_storage"
 require_relative "theme_check/in_memory_storage"
 require_relative "theme_check/tags"
-require_relative "theme_check/template_rewriter"
-require_relative "theme_check/template"
 require_relative "theme_check/theme"
-require_relative "theme_check/visitor"
 require_relative "theme_check/corrector"
-require_relative "theme_check/html_node"
+require_relative "theme_check/liquid_visitor"
 require_relative "theme_check/html_visitor"
-require_relative "theme_check/html_check"
 
 Dir[__dir__ + "/theme_check/checks/*.rb"].each { |file| require file }
 

data/theme-check.gemspec

@@ -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.0.1')
+  spec.add_dependency('liquid', '>= 5.1.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.6.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Marc-André Cournoyer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,8 @@ files:
 - lib/theme_check/json_helpers.rb
 - lib/theme_check/json_printer.rb
 - lib/theme_check/language_server.rb
+- lib/theme_check/language_server/bridge.rb
+- lib/theme_check/language_server/channel.rb
 - lib/theme_check/language_server/completion_engine.rb
 - lib/theme_check/language_server/completion_helper.rb
 - lib/theme_check/language_server/completion_provider.rb
@@ -209,6 +211,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_engine.rb
 - lib/theme_check/language_server/diagnostics_tracker.rb
 - lib/theme_check/language_server/document_link_engine.rb
 - lib/theme_check/language_server/document_link_provider.rb
@@ -217,12 +220,17 @@ files:
 - lib/theme_check/language_server/document_link_providers/render_document_link_provider.rb
 - lib/theme_check/language_server/document_link_providers/section_document_link_provider.rb
 - lib/theme_check/language_server/handler.rb
+- lib/theme_check/language_server/io_messenger.rb
+- lib/theme_check/language_server/messenger.rb
 - lib/theme_check/language_server/protocol.rb
 - lib/theme_check/language_server/server.rb
 - lib/theme_check/language_server/tokens.rb
 - lib/theme_check/language_server/uri_helper.rb
 - lib/theme_check/language_server/variable_lookup_finder.rb
 - lib/theme_check/liquid_check.rb
+- lib/theme_check/liquid_file.rb
+- lib/theme_check/liquid_node.rb
+- lib/theme_check/liquid_visitor.rb
 - lib/theme_check/locale_diff.rb
 - lib/theme_check/node.rb
 - lib/theme_check/offense.rb
@@ -238,16 +246,15 @@ files:
 - lib/theme_check/shopify_liquid/deprecated_filter.rb
 - lib/theme_check/shopify_liquid/filter.rb
 - lib/theme_check/shopify_liquid/object.rb
+- lib/theme_check/shopify_liquid/system_translations.rb
 - lib/theme_check/shopify_liquid/tag.rb
 - lib/theme_check/storage.rb
 - lib/theme_check/string_helpers.rb
 - lib/theme_check/tags.rb
-- lib/theme_check/template.rb
-- lib/theme_check/template_rewriter.rb
 - lib/theme_check/theme.rb
 - lib/theme_check/theme_file.rb
+- lib/theme_check/theme_file_rewriter.rb
 - lib/theme_check/version.rb
-- lib/theme_check/visitor.rb
 - packaging/homebrew/theme_check.base.rb
 - theme-check.gemspec
 homepage: https://github.com/Shopify/theme-check