slim_lint 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3586e4fdad857cd9982603d97fd17acca434ef45caabe63ad6df523d1ca7ed76
-  data.tar.gz: 56bf2830ea686935a7ab26b6128fc4a3aa367ddb0de20a0ed6cbcd3f1b771338
+  metadata.gz: e9478570d94e93349a03f9f7a67789f3c0ff356bd8bd95ee7fe5628248eaaab9
+  data.tar.gz: 23bc11a5e84b251523397d12bcf0c776d8755373fffbfa7ce183353fe8a86b73
 SHA512:
-  metadata.gz: 0b8b60196d99f38fff022cd248b40bfbcd5ce7d0fd82ce2ff8eb3e1e1bdf1a7582537e7d4b2a2c9c9eb7713d0dc6f58a002e029889a11f69d76b7d0b61636d4c
-  data.tar.gz: 324ef5fbb06bf9b81134ff9fbf698bf02482f66ab0f42f10f2685f06524a6d2b1353310a5c9fe4feb001bffcd541c99036904bc4501f9af9607bf9cf6b68bbdc
+  metadata.gz: f40d2b1af0278fd5f2ea727f0a7ee39322df8b7c1ddf155ece528ac7f99c8dd8b0284af8d622e05eec9ef229544fd953b1f6a51cea9e11d35c23bba1d7d7c7c3
+  data.tar.gz: 6c96c5b859896bf1a3d04fe1ca336cfae1e7c15bbcb89f5a6143d1b952ec3508febab94dd4fa618fbbed98405bbaed941cd6a94bb3c2e2bad3a1bdc04ddb5574

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim_lint
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Slim template linting tool
 test_files: []