slim_lint 0.33.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08768fa2264ad994c53a3e0f993fa0caa38e300c77ae64d5531e972c440aeaaf'
-  data.tar.gz: bff84f96661b0c46c2a5445b37da6932b00ee2e2fa56e2ed1e8e76228db98bf5
+  metadata.gz: e9478570d94e93349a03f9f7a67789f3c0ff356bd8bd95ee7fe5628248eaaab9
+  data.tar.gz: 23bc11a5e84b251523397d12bcf0c776d8755373fffbfa7ce183353fe8a86b73
 SHA512:
-  metadata.gz: 763da1e8ccb05a25e7c54813363fa86ad340d387a3dedf1b3a41ef8f0cada1e413861e7159bda4931bbe45150ae11314c79e51233ac054eb9f7684245d8b0091
-  data.tar.gz: a5eb859a052ff7276ecef9718b4a0952aa8ddc77738313a047c67773ae7b1556e49a051f101e30de92014f26e8e894b1733e30eacbe4b28b452c9ea0124226f5
+  metadata.gz: f40d2b1af0278fd5f2ea727f0a7ee39322df8b7c1ddf155ece528ac7f99c8dd8b0284af8d622e05eec9ef229544fd953b1f6a51cea9e11d35c23bba1d7d7c7c3
+  data.tar.gz: 6c96c5b859896bf1a3d04fe1ca336cfae1e7c15bbcb89f5a6143d1b952ec3508febab94dd4fa618fbbed98405bbaed941cd6a94bb3c2e2bad3a1bdc04ddb5574

data/lib/slim_lint/cli.rb

@@ -65,7 +65,7 @@ module SlimLint
     # exception.
     def handle_exception(exception)
       case exception
-      when SlimLint::Exceptions::ConfigurationError
+      when SlimLint::Exceptions::ConfigurationError, SlimLint::NoSuchLinter
         log.error exception.message
         EX_CONFIG
       when SlimLint::Exceptions::InvalidCLIOption

data/lib/slim_lint/configuration.rb

@@ -82,9 +82,25 @@ module SlimLint
     def validate
       ensure_exclude_option_array_exists
       ensure_linter_section_exists
+      ensure_linter_names_are_valid
       ensure_linter_include_exclude_arrays_exist
     end
 
+    # Ensures all linter names in the configuration are valid.
+    def ensure_linter_names_are_valid
+      return if @hash['linters'].nil?
+
+      valid_names = SlimLint::LinterRegistry.linter_names
+      return if valid_names.empty? # Skip if linters not yet loaded
+
+      @hash['linters'].each_key do |linter_name|
+        next if valid_names.include?(linter_name)
+
+        raise SlimLint::NoSuchLinter,
+              "No such linter: #{linter_name}. Available: #{valid_names.join(', ')}"
+      end
+    end
+
     # Ensures the `exclude` global option is an array.
     def ensure_exclude_option_array_exists
       @hash['exclude'] = Array(@hash['exclude'])

data/lib/slim_lint/linter/control_statement_spacing.rb

@@ -11,10 +11,11 @@ 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]
+      ruby = captures[:ruby]
+      line = source_line_for(sexp, /=[=<>]* *#{Regexp.escape(ruby[/[^\n]*/])}/)
+      next unless line
 
       # Remove any Ruby code, because our regexp below must not match inside Ruby.
-      ruby = captures[:ruby]
       line = line.sub(ruby, 'x')
 
       next if line =~ /[^ ] ==?<?>? [^ ]/
@@ -23,11 +24,33 @@ module SlimLint
     end
 
     on [:slim, :control] do |sexp|
-      line = document.source_lines[sexp.line - 1]
+      ruby = sexp[2]
+      line = source_line_for(sexp, /- *#{Regexp.escape(ruby[/[^\n]*/])}/)
+      next unless line
 
       next if line =~ /^ *- [^ ]/
 
       report_lint(sexp, MESSAGE_CONTROL)
     end
+
+    private
+
+    # Finds the original Slim source line for the given Sexp.
+    #
+    # Backslash (`\`) and comma (`,`) line continuations in preceding
+    # attributes are collapsed by the Slim parser without emitting a newline,
+    # which causes the line number reported for subsequent Sexps to be too low
+    # (see https://github.com/sds/slim-lint/issues/201). We compensate by
+    # searching forward from the reported line for the line that actually
+    # contains the statement, falling back to the reported line otherwise.
+    #
+    # @param sexp [SlimLint::Sexp]
+    # @param pattern [Regexp] matches the source line containing the statement
+    # @return [String, nil]
+    def source_line_for(sexp, pattern)
+      index = sexp.line - 1
+      lines = document.source_lines[index..] || []
+      lines.find { |line| line =~ pattern } || document.source_lines[index]
+    end
   end
 end

data/lib/slim_lint/linter_registry.rb

@@ -11,6 +11,13 @@ module SlimLint
       # List of all registered linters.
       attr_reader :linters
 
+      # Returns the short names of all registered linters.
+      #
+      # @return [Array<String>]
+      def linter_names
+        @linters.map { |linter| linter.name.split('::').last }
+      end
+
       # Executed when a linter includes the {LinterRegistry} module.
       #
       # This results in the linter being registered with the registry.

data/lib/slim_lint/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Shane da Silva
 bindir: bin
 cert_chain: []
-date: 2025-04-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Slim template linting tool
 test_files: []