theme-check 1.3.0 → 1.5.2

data/lib/theme_check/json_printer.rb

@@ -3,9 +3,13 @@ require 'json'
 
 module ThemeCheck
   class JsonPrinter
+    def initialize(out_stream = STDOUT)
+      @out = out_stream
+    end
+
     def print(offenses)
       json = offenses_by_path(offenses)
-      puts JSON.dump(json)
+      @out.puts JSON.dump(json)
     end
 
     def offenses_by_path(offenses)
@@ -21,6 +25,7 @@ module ThemeCheck
             styleCount: path_offenses.count { |offense| offense[:severity] == Check::SEVERITY_VALUES[:style] },
           }
         end
+        .sort_by { |o| o[:path] }
     end
   end
 end

data/lib/theme_check/language_server/constants.rb

@@ -2,21 +2,28 @@
 
 module ThemeCheck
   module LanguageServer
-    PARTIAL_RENDER = %r{
-      \{\%-?\s*render\s+'(?<partial>[^']*)'|
-      \{\%-?\s*render\s+"(?<partial>[^"]*)"|
+    def self.partial_tag(tag)
+      %r{
+        \{\%-?\s*#{tag}\s+'(?<partial>[^']*)'|
+        \{\%-?\s*#{tag}\s+"(?<partial>[^"]*)"|
+
+        # in liquid tags the whole line is white space until the tag
+        ^\s*#{tag}\s+'(?<partial>[^']*)'|
+        ^\s*#{tag}\s+"(?<partial>[^"]*)"
+      }mix
+    end
+
+    PARTIAL_RENDER = partial_tag('render')
+    PARTIAL_INCLUDE = partial_tag('include')
+    PARTIAL_SECTION = partial_tag('section')
 
-      # in liquid tags the whole line is white space until render
-      ^\s*render\s+'(?<partial>[^']*)'|
-      ^\s*render\s+"(?<partial>[^"]*)"
-    }mix
     ASSET_INCLUDE = %r{
-      \{\%-?\s*'(?<partial>[^']*)'\s*\|\s*asset_url|
-      \{\%-?\s*"(?<partial>[^"]*)"\s*\|\s*asset_url|
+      \{\{-?\s*'(?<partial>[^']*)'\s*\|\s*asset_url|
+      \{\{-?\s*"(?<partial>[^"]*)"\s*\|\s*asset_url|
 
       # in liquid tags the whole line is white space until the asset partial
-      ^\s*'(?<partial>[^']*)'\s*\|\s*asset_url|
-      ^\s*"(?<partial>[^"]*)"\s*\|\s*asset_url
+      ^\s*(?:echo|assign[^=]*\=)\s*'(?<partial>[^']*)'\s*\|\s*asset_url|
+      ^\s*(?:echo|assign[^=]*\=)\s*"(?<partial>[^"]*)"\s*\|\s*asset_url
     }mix
   end
 end

data/lib/theme_check/language_server/document_link_engine.rb

@@ -3,81 +3,17 @@
 module ThemeCheck
   module LanguageServer
     class DocumentLinkEngine
-      include PositionHelper
-      include RegexHelpers
-
       def initialize(storage)
         @storage = storage
+        @providers = DocumentLinkProvider.all.map { |x| x.new(storage) }
       end
 
       def document_links(relative_path)
         buffer = @storage.read(relative_path)
         return [] unless buffer
-        snippet_matches = matches(buffer, PARTIAL_RENDER).map do |match|
-          start_line, start_character = from_index_to_row_column(
-            buffer,
-            match.begin(:partial),
-          )
-
-          end_line, end_character = from_index_to_row_column(
-            buffer,
-            match.end(:partial)
-          )
-
-          {
-            target: snippet_link(match[:partial]),
-            range: {
-              start: {
-                line: start_line,
-                character: start_character,
-              },
-              end: {
-                line: end_line,
-                character: end_character,
-              },
-            },
-          }
+        @providers.flat_map do |p|
+          p.document_links(buffer)
         end
-        asset_matches = matches(buffer, ASSET_INCLUDE).map do |match|
-          start_line, start_character = from_index_to_row_column(
-            buffer,
-            match.begin(:partial),
-          )
-
-          end_line, end_character = from_index_to_row_column(
-            buffer,
-            match.end(:partial)
-          )
-
-          {
-            target: asset_link(match[:partial]),
-            range: {
-              start: {
-                line: start_line,
-                character: start_character,
-              },
-              end: {
-                line: end_line,
-                character: end_character,
-              },
-            },
-          }
-        end
-        snippet_matches + asset_matches
-      end
-
-      def snippet_link(partial)
-        file_link('snippets', partial, '.liquid')
-      end
-
-      def asset_link(partial)
-        file_link('assets', partial, '')
-      end
-
-      private
-
-      def file_link(directory, partial, extension)
-        "file://#{@storage.path(directory + '/' + partial + extension)}"
       end
     end
   end

data/lib/theme_check/language_server/document_link_provider.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module ThemeCheck
+  module LanguageServer
+    class DocumentLinkProvider
+      include RegexHelpers
+      include PositionHelper
+      include URIHelper
+
+      class << self
+        attr_accessor :partial_regexp, :destination_directory, :destination_postfix
+
+        def all
+          @all ||= []
+        end
+
+        def inherited(subclass)
+          all << subclass
+        end
+      end
+
+      def initialize(storage = InMemoryStorage.new)
+        @storage = storage
+      end
+
+      def partial_regexp
+        self.class.partial_regexp
+      end
+
+      def destination_directory
+        self.class.destination_directory
+      end
+
+      def destination_postfix
+        self.class.destination_postfix
+      end
+
+      def document_links(buffer)
+        matches(buffer, partial_regexp).map do |match|
+          start_line, start_character = from_index_to_row_column(
+            buffer,
+            match.begin(:partial),
+          )
+
+          end_line, end_character = from_index_to_row_column(
+            buffer,
+            match.end(:partial)
+          )
+
+          {
+            target: file_link(match[:partial]),
+            range: {
+              start: {
+                line: start_line,
+                character: start_character,
+              },
+              end: {
+                line: end_line,
+                character: end_character,
+              },
+            },
+          }
+        end
+      end
+
+      def file_link(partial)
+        file_uri(@storage.path(destination_directory + '/' + partial + destination_postfix))
+      end
+    end
+  end
+end

data/lib/theme_check/language_server/document_link_providers/asset_document_link_provider.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ThemeCheck
+  module LanguageServer
+    class AssetDocumentLinkProvider < DocumentLinkProvider
+      @partial_regexp = ASSET_INCLUDE
+      @destination_directory = "assets"
+      @destination_postfix = ""
+    end
+  end
+end

data/lib/theme_check/language_server/document_link_providers/include_document_link_provider.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ThemeCheck
+  module LanguageServer
+    class IncludeDocumentLinkProvider < DocumentLinkProvider
+      @partial_regexp = PARTIAL_INCLUDE
+      @destination_directory = "snippets"
+      @destination_postfix = ".liquid"
+    end
+  end
+end

data/lib/theme_check/language_server/document_link_providers/render_document_link_provider.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ThemeCheck
+  module LanguageServer
+    class RenderDocumentLinkProvider < DocumentLinkProvider
+      @partial_regexp = PARTIAL_RENDER
+      @destination_directory = "snippets"
+      @destination_postfix = ".liquid"
+    end
+  end
+end

data/lib/theme_check/language_server/document_link_providers/section_document_link_provider.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ThemeCheck
+  module LanguageServer
+    class SectionDocumentLinkProvider < DocumentLinkProvider
+      @partial_regexp = PARTIAL_SECTION
+      @destination_directory = "sections"
+      @destination_postfix = ".liquid"
+    end
+  end
+end

data/lib/theme_check/language_server/handler.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 require "benchmark"
-require "uri"
-require "cgi"
 
 module ThemeCheck
   module LanguageServer
     class Handler
+      include URIHelper
+
       CAPABILITIES = {
         completionProvider: {
           triggerCharacters: ['.', '{{ ', '{% '],
@@ -26,7 +27,7 @@ module ThemeCheck
       end
 
       def on_initialize(id, params)
-        @root_path = path_from_uri(params["rootUri"]) || params["rootPath"]
+        @root_path = root_path_from_params(params)
 
         # Tell the client we don't support anything if there's no rootPath
         return send_response(id, { capabilities: {} }) if @root_path.nil?
@@ -55,10 +56,9 @@ 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))
+        analyze_and_send_offenses(text_document_uri(params)) if @diagnostics_tracker.first_run?
       end
 
       def on_text_document_did_save(_id, params)
@@ -97,19 +97,23 @@ module ThemeCheck
       end
 
       def text_document_uri(params)
-        path_from_uri(params.dig('textDocument', 'uri'))
-      end
-
-      def path_from_uri(uri_string)
-        return if uri_string.nil?
-        uri = URI(uri_string)
-        CGI.unescape(uri.path)
+        file_path(params.dig('textDocument', 'uri'))
       end
 
       def relative_path_from_text_document_uri(params)
         @storage.relative_path(text_document_uri(params))
       end
 
+      def root_path_from_params(params)
+        root_uri = params["rootUri"]
+        root_path = params["rootPath"]
+        if root_uri
+          file_path(root_uri)
+        elsif root_path
+          root_path
+        end
+      end
+
       def text_document_text(params)
         params.dig('textDocument', 'text')
       end
@@ -175,7 +179,7 @@ module ThemeCheck
       def send_diagnostic(path, offenses)
         # https://microsoft.github.io/language-server-protocol/specifications/specification-current/#notificationMessage
         send_notification('textDocument/publishDiagnostics', {
-          uri: "file://#{path}",
+          uri: file_uri(path),
           diagnostics: offenses.map { |offense| offense_to_diagnostic(offense) },
         })
       end

data/lib/theme_check/language_server/server.rb

@@ -25,6 +25,15 @@ module ThemeCheck
         @out = out_stream
         @err = err_stream
 
+        # Because programming is fun,
+        #
+        # Ruby on Windows turns \n into \r\n. Which means that \r\n
+        # gets turned into \r\r\n. Which means that the protocol
+        # breaks on windows unless we turn STDOUT into binary mode.
+        #
+        # Hours wasted: 9.
+        @out.binmode
+
         @out.sync = true # do not buffer
         @err.sync = true # do not buffer
 
@@ -52,19 +61,8 @@ module ThemeCheck
         response_body = JSON.dump(response)
         log(JSON.pretty_generate(response)) if $DEBUG
 
-        # Because programming is fun,
-        #
-        # Ruby on Windows turns \n into \r\n. Which means that \r\n
-        # gets turned into \r\r\n. Which means that the protocol
-        # breaks on windows unless we turn STDOUT into binary mode and
-        # set the encoding manually (yuk!) or we do this little hack
-        # here and put \n which gets transformed into \r\n on windows
-        # only...
-        #
-        # Hours wasted: 8.
-        eol = Gem.win_platform? ? "\n" : "\r\n"
-        @out.write("Content-Length: #{response_body.bytesize}#{eol}")
-        @out.write(eol)
+        @out.write("Content-Length: #{response_body.bytesize}\r\n")
+        @out.write("\r\n")
         @out.write(response_body)
         @out.flush
       end

data/lib/theme_check/language_server/uri_helper.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "benchmark"
+require "uri"
+require "cgi"
+
+module ThemeCheck
+  module LanguageServer
+    module URIHelper
+      # Will URI.encode a string the same way VS Code would. There are two things
+      # to watch out for:
+      #
+      # 1. VS Code still uses the outdated '%20' for spaces
+      # 2. VS Code prefixes Windows paths with / (so /C:/Users/... is expected)
+      #
+      # Exists because of https://github.com/Shopify/theme-check/issues/360
+      def file_uri(absolute_path)
+        "file://" + absolute_path
+          .to_s
+          .split('/')
+          .map { |x| CGI.escape(x).gsub('+', '%20') }
+          .join('/')
+          .sub(%r{^/?}, '/') # Windows paths should be prefixed by /c:
+      end
+
+      def file_path(uri_string)
+        return if uri_string.nil?
+        uri = URI(uri_string)
+        path = CGI.unescape(uri.path)
+        # On Windows, VS Code sends the URLs as file:///C:/...
+        # /C:/1234 is not a valid path in ruby. So we strip the slash.
+        path = path.sub(%r{^/([a-z]:/)}i, '\1')
+        path
+      end
+    end
+  end
+end

data/lib/theme_check/language_server.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require_relative "language_server/protocol"
 require_relative "language_server/constants"
+require_relative "language_server/uri_helper"
 require_relative "language_server/handler"
 require_relative "language_server/server"
 require_relative "language_server/tokens"
@@ -8,6 +9,7 @@ require_relative "language_server/variable_lookup_finder"
 require_relative "language_server/completion_helper"
 require_relative "language_server/completion_provider"
 require_relative "language_server/completion_engine"
+require_relative "language_server/document_link_provider"
 require_relative "language_server/document_link_engine"
 require_relative "language_server/diagnostics_tracker"
 
@@ -15,6 +17,10 @@ Dir[__dir__ + "/language_server/completion_providers/*.rb"].each do |file|
   require file
 end
 
+Dir[__dir__ + "/language_server/document_link_providers/*.rb"].each do |file|
+  require file
+end
+
 module ThemeCheck
   module LanguageServer
     def self.start