slim_lint 0.23.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d873940ddc504e1c78dc4ec1c1c7140a51ebc308294cd8083d3bde7bf7ee814
-  data.tar.gz: d284de951c7ebf98448cdc49fab0ca54fa5c9b9cc6f6e0c731359b73a0ba64fa
+  metadata.gz: 58c99ab50012a0f3475e6518e69bade743b55e6ed5eb4f5dd25a98ea1b7a617e
+  data.tar.gz: 4593348af814f4bce1bd240d4982eec2acd9d4c7bbda5f5ccc231a3a51b8c148
 SHA512:
-  metadata.gz: 5147b5647239c39231529cc18cb397ac33fe1d6a07db58b33ddcda9924022e71cc24f3a4b7f91bf4795b668d031b8d65deb85dc5ee8869bca1237e18eb5af5a3
-  data.tar.gz: 4afba73fe9d49dc124554b63bb230c1135c18288d377fb0ad9af098b418dec31d1524410c09dba6fb284fb1ab8e0742a06b04c97fdd850d04500e500d9ef57ac
+  metadata.gz: 53ea008e7e03d7261af22c33e098be489096299117b9ec103406382568af8b8b3c10e0a77a3e97e9848c88a57d04d2f5a6b7998b48555d7ea205ceb136f95cdb
+  data.tar.gz: 1e5e98f7d7e6eacc805a85451b8428f2f746b91b5b3433ce5262779d6bd9285b6db00e463c3d1b79912e9b93b677b5f12f0bf0e50613f284b8b482732fc7e552

data/bin/slim-lint

@@ -3,5 +3,5 @@
 
 require 'slim_lint/cli'
 
-logger = SlimLint::Logger.new(STDOUT)
+logger = SlimLint::Logger.new($stdout)
 exit SlimLint::CLI.new(logger).run(ARGV)

data/config/default.yml

@@ -94,3 +94,6 @@ linters:
 
   TrailingWhitespace:
     enabled: true
+
+  Zwsp:
+    enabled: false

data/lib/slim_lint/document.rb

@@ -67,7 +67,7 @@ module SlimLint
           # Second capture match --- or ... followed by optional whitespace
           # and newline. This matches the closing --- for the frontmatter.
           (---|\.\.\.)\s*$\n?/mx
-        source = $POSTMATCH
+        source = ::Regexp.last_match.post_match
       end
 
       source

data/lib/slim_lint/file_finder.rb

@@ -72,7 +72,7 @@ module SlimLint
     # @param path [String]
     # @return [String]
     def normalize_path(path)
-      path.start_with?(".#{File::SEPARATOR}") ? path[2..-1] : path
+      path.start_with?(".#{File::SEPARATOR}") ? path[2..] : path
     end
 
     # Whether the given file should be treated as a Slim file.

data/lib/slim_lint/filters/control_processor.rb

@@ -5,7 +5,7 @@ module SlimLint::Filters
   # variables and other cruft (which in the context of extracting Ruby code,
   # results in a lot of weird cops reported by RuboCop).
   class ControlProcessor < Slim::Filter
-    BLOCK_RE = /\A(if|unless)\b|\bdo\s*(\|[^\|]*\|)?\s*$/
+    BLOCK_RE = /\A(if|unless)\b|\bdo\s*(\|[^|]*\|)?\s*$/
 
     # Handle control expression `[:slim, :control, code, content]`
     #

data/lib/slim_lint/linter/control_statement_spacing.rb

@@ -9,8 +9,14 @@ module SlimLint
 
     on [:html, :tag, anything, [],
          [:slim, :output, anything, capture(:ruby, anything)]] do |sexp|
-      # Fetch original Slim code that contains an element with a control statement.
-      line = document.source_lines[sexp.line() - 1]
+      # Process original slim code so that multi-line attributes become single line.
+      # And store the correction line count
+      source = merge_multiline_attributes(document.source_lines)
+
+      # Fetch processed Slim code that contains an element with a control statement.
+      line = source[sexp.line - 1][:line]
+      # Apply correction to the line count.
+      sexp.line += source[sexp.line - 1][:line_count]
 
       # Remove any Ruby code, because our regexp below must not match inside Ruby.
       ruby = captures[:ruby]
@@ -20,5 +26,29 @@ module SlimLint
 
       report_lint(sexp, MESSAGE)
     end
+
+    private
+
+    def merge_multiline_attributes(source_lines)
+      result = []
+      memo = ''
+      correction_line_count = 0
+
+      source_lines.each do |line|
+        memo += line.chomp('\\')
+
+        # Lines ending in a backslash are concatenated with the next line
+        # And count the number of lines to correct the sexp line count.
+        if line.match?(/\\$/)
+          correction_line_count += 1
+          next
+        end
+
+        # Add merged rows and correction line count to the result and reset the memo
+        result << { line: memo, line_count: correction_line_count }
+        memo = ''
+      end
+      result
+    end
   end
 end

data/lib/slim_lint/linter/zwsp.rb

@@ -4,7 +4,7 @@ module SlimLint
   class Linter::Zwsp < Linter
     include LinterRegistry
 
-    MSG = 'Remove Zwsp'
+    MSG = 'Remove zero-width space'
 
     on_start do |_sexp|
       dummy_node = Struct.new(:line)

data/lib/slim_lint/linter.rb

@@ -71,7 +71,7 @@ module SlimLint
     def disabled_lines
       @disabled_lines ||= begin
         currently_disabled = false
-        @document.source_lines.each_with_index.reduce([]) do |lines, pair|
+        @document.source_lines.each_with_index.each_with_object([]) do |pair, lines|
           line = pair[0]
           line_number = pair[1] + 1
 
@@ -82,7 +82,6 @@ module SlimLint
           elsif currently_disabled
             lines << line_number
           end
-          lines
         end
       end
     end

data/lib/slim_lint/linter_registry.rb

@@ -27,11 +27,9 @@ module SlimLint
       # @return [Array<Class>]
       def extract_linters_from(linter_names)
         linter_names.map do |linter_name|
-          begin
-            SlimLint::Linter.const_get(linter_name)
-          rescue NameError
-            raise NoSuchLinter, "Linter #{linter_name} does not exist"
-          end
+          SlimLint::Linter.const_get(linter_name)
+        rescue NameError
+          raise NoSuchLinter, "Linter #{linter_name} does not exist"
         end
       end
     end

data/lib/slim_lint/rake_task.rb

@@ -87,7 +87,7 @@ module SlimLint
     def run_cli(task_args)
       cli_args = ['--config', config] if config
 
-      logger = quiet ? SlimLint::Logger.silent : SlimLint::Logger.new(STDOUT)
+      logger = quiet ? SlimLint::Logger.silent : SlimLint::Logger.new($stdout)
       result = SlimLint::CLI.new(logger).run(Array(cli_args) + files_to_lint(task_args))
 
       fail "#{SlimLint::APP_NAME} failed with exit code #{result}" unless result == 0
@@ -98,7 +98,7 @@ module SlimLint
     #
     # @param task_args [Rake::TaskArguments]
     def files_to_lint(task_args)
-      # Note: we're abusing Rake's argument handling a bit here. We call the
+      # NOTE: we're abusing Rake's argument handling a bit here. We call the
       # first argument `files` but it's actually only the first file--we pull
       # the rest out of the `extras` from the task arguments. This is so we
       # can specify an arbitrary list of files separated by commas on the

data/lib/slim_lint/ruby_parser.rb

@@ -2,7 +2,14 @@
 
 require 'rubocop'
 require 'rubocop/ast/builder'
-require 'parser/current'
+
+def require_parser(path)
+  prev = $VERBOSE
+$VERBOSE = nil
+  require "parser/#{path}"
+ensure
+  $VERBOSE = prev
+end
 
 module SlimLint
   # Parser for the Ruby language.
@@ -13,6 +20,7 @@ module SlimLint
   class RubyParser
     # Creates a reusable parser.
     def initialize
+      require_parser('current')
       @builder = ::RuboCop::AST::Builder.new
       @parser = ::Parser::CurrentRuby.new(@builder)
     end

data/lib/slim_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module SlimLint
-  VERSION = '0.23.0'
+  VERSION = '0.25.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.78.0
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +50,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -165,14 +157,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Slim template linting tool