slim_lint 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d873940ddc504e1c78dc4ec1c1c7140a51ebc308294cd8083d3bde7bf7ee814
-  data.tar.gz: d284de951c7ebf98448cdc49fab0ca54fa5c9b9cc6f6e0c731359b73a0ba64fa
+  metadata.gz: e50e0e7ca03f55bd42e692cc7875adab1d454bf9b2984f97e1b7140677bbc700
+  data.tar.gz: b5d93260c2f354cedac16577e8692c5202eb685e7532b511edfefd196a086e65
 SHA512:
-  metadata.gz: 5147b5647239c39231529cc18cb397ac33fe1d6a07db58b33ddcda9924022e71cc24f3a4b7f91bf4795b668d031b8d65deb85dc5ee8869bca1237e18eb5af5a3
-  data.tar.gz: 4afba73fe9d49dc124554b63bb230c1135c18288d377fb0ad9af098b418dec31d1524410c09dba6fb284fb1ab8e0742a06b04c97fdd850d04500e500d9ef57ac
+  metadata.gz: 3a64584b6cda49797435f8e996a9ef448f75ab2f2956b2f6d94810d4a654178a7e35949a031af5d5bf543657916aaae9368a68e66942a02fd0619cab63c73521
+  data.tar.gz: 7846bf8dc4aef4a78e4406b9c661ac44823297f66c59cbd7d3b714cf51efa30b424350e0f017d1ebabb9348b8ae1569f302330efc66613cd07f70b1025929087

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/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

@@ -10,7 +10,7 @@ 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]
+      line = document.source_lines[sexp.line - 1]
 
       # Remove any Ruby code, because our regexp below must not match inside Ruby.
       ruby = captures[:ruby]

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/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.24.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.24.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2023-02-02 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