haml_lint 0.49.0 → 0.49.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0411721c82b95f3662c12b9bb3eeff8013a81dbef095d1b5756baf529f121fd9
-  data.tar.gz: 2ab1affd25ac7b27278a35bc56a883aeb8626573e082b3ac4a2e725bdff1a90f
+  metadata.gz: 95c5137a04c59dbfc74fbc6648be0e502ae683e7bca5ff756bab9daf128243cb
+  data.tar.gz: 4b7429295c1a07d73dd3fae058cafba55fdcab05a7113623a5db4d8aed4d7d11
 SHA512:
-  metadata.gz: 431cc4b6f6dec7e6d910e7406a76fa58a9224fd689446636e02a7cb895137c33090a3fd845ffbeda941650549da069b8ce056eb979494d6442b348939da32ba5
-  data.tar.gz: 9c491a34546d7b437ee53ba5ec4059f8019bcd45dae564c90d230d8faaf69c7e4ec5f07585afc61bd5e0f903b1678567b727d9d82b3a30723e0aa1c8767923a6
+  metadata.gz: 0ab868d2be78c9a5fcebc8dd370687fa088deb4b537a64c3ff878e4a8bb4a057a9841c6b0f02914a9ebd791bf19a19e737d9f559e8b12f577c215695ff9b207d
+  data.tar.gz: dbd373708eba214749fc1aa20e42d330c494ac1e3161a71527c956f405e845fb724d312dfa4bfae1bc3c080fe2d972fb75cf9915e1a1c0a808ba4b1ca963be15

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -102,7 +102,8 @@ module HamlLint::RubyExtraction
         # that contains interpolation.
         indent = raw_first_line.index(/\S/)
         @ruby_chunks << PlaceholderMarkerChunk.new(node, 'interpolation', indent: indent)
-        add_interpolation_chunks(node, raw_first_line, node.line - 1, indent: indent)
+        lines = extract_piped_plain_multilines(node.line - 1)
+        add_interpolation_chunks(node, lines.join("\n"), node.line - 1, indent: indent)
         return
       end
 
@@ -327,9 +328,16 @@ module HamlLint::RubyExtraction
         # ex: %tag hello #{world}
         # Sadly, the text with interpolation is escaped from the original, but this code
         # needs the original.
-        interpolation_original = @document.unescape_interpolation_to_original_cache[node.script]
 
+        interpolation_original = @document.unescape_interpolation_to_original_cache[node.script]
         line_start_index = @original_haml_lines[node.line - 1].rindex(interpolation_original)
+        if line_start_index.nil?
+          raw_lines = extract_piped_plain_multilines(node.line - 1)
+          equivalent_haml_code = "#{raw_lines.first} #{raw_lines[1..].map(&:lstrip).join(' ')}"
+          line_start_index = equivalent_haml_code.rindex(interpolation_original)
+
+          interpolation_original = raw_lines.join("\n")
+        end
         add_interpolation_chunks(node, interpolation_original, node.line - 1,
                                  line_start_index: line_start_index, indent: indent)
       else
@@ -386,7 +394,7 @@ module HamlLint::RubyExtraction
 
     # Adds chunks for the interpolation within the given code
     def add_interpolation_chunks(node, code, haml_line_index, indent:, line_start_index: 0)
-      HamlLint::Utils.handle_interpolation_with_indexes(code) do |scanner, line_index, char_index|
+      HamlLint::Utils.handle_interpolation_with_indexes(code) do |scanner, line_index, line_char_index|
         escapes = scanner[2].size
         next if escapes.odd?
         char = scanner[3] # '{', '@' or '$'
@@ -395,20 +403,25 @@ module HamlLint::RubyExtraction
           next
         end
 
-        start_char_index = char_index
-        start_char_index += line_start_index if line_index == 0
+        line_start_char_index = line_char_index
+        line_start_char_index += line_start_index if line_index == 0
+        code_start_char_index = scanner.charpos
 
-        Haml::Util.balance(scanner, '{', '}', 1)[0][0...-1]
+        # This moves the scanner
+        Haml::Util.balance(scanner, '{', '}', 1)
 
         # Need to manually get the code now that we have positions so that all whitespace is present,
         # because Haml::Util.balance does a strip...
-        interpolated_code = code[char_index...scanner.charpos - 1]
-
-        interpolated_code = "#{' ' * indent}#{script_output_prefix}#{interpolated_code}"
+        interpolated_code = code[code_start_char_index...scanner.charpos - 1]
 
         if interpolated_code.include?("\n")
           # We can't correct multiline interpolation.
           # Finding meaningful code to generate and then transfer back is pretty complex
+
+          # Since we can't fix it, strip around the code to reduce RuboCop lints that we won't be able to fix.
+          interpolated_code = interpolated_code.strip
+          interpolated_code = "#{' ' * indent}#{script_output_prefix}#{interpolated_code}"
+
           placeholder_code = interpolated_code.gsub(/\s*\n\s*/, ' ').rstrip
           unless parse_ruby(placeholder_code)
             placeholder_code = interpolated_code.gsub(/\s*\n\s*/, '; ').rstrip
@@ -416,9 +429,10 @@ module HamlLint::RubyExtraction
           @ruby_chunks << AdHocChunk.new(node, [placeholder_code],
                                          haml_line_index: haml_line_index + line_index)
         else
+          interpolated_code = "#{' ' * indent}#{script_output_prefix}#{interpolated_code}"
           @ruby_chunks << InterpolationChunk.new(node, [interpolated_code],
                                                  haml_line_index: haml_line_index + line_index,
-                                                 start_char_index: start_char_index,
+                                                 start_char_index: line_start_char_index,
                                                  end_marker_indent: indent)
         end
       end
@@ -433,6 +447,15 @@ module HamlLint::RubyExtraction
       end
     end
 
+    def process_plain_multiline!(line)
+      if line&.end_with?(' |')
+        line[-2..] = ''
+        true
+      else
+        false
+      end
+    end
+
     # Returns the raw lines from the haml for the given index.
     # Multiple lines are returned when a line ends with a comma as that is the only
     # time HAMLs allows Ruby lines to be split.
@@ -517,6 +540,25 @@ module HamlLint::RubyExtraction
       [first_line_offset, ruby_lines]
     end
 
+    def extract_piped_plain_multilines(first_line_index)
+      lines = []
+
+      cur_line = @original_haml_lines[first_line_index].rstrip
+      cur_line_index = first_line_index
+
+      # The pipes must also be on the last line of the multi-line section
+      while cur_line && process_plain_multiline!(cur_line)
+        lines << cur_line
+        cur_line_index += 1
+        cur_line = @original_haml_lines[cur_line_index].rstrip
+      end
+
+      if lines.empty?
+        lines << cur_line
+      end
+      lines
+    end
+
     # Tag attributes actually handle multiline differently than scripts.
     # The basic system basically keeps considering more lines until it meets the closing braces, but still
     # processes pipes too (same as extract_raw_ruby_lines).

data/lib/haml_lint/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.49.0'
+  VERSION = '0.49.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.49.0
+  version: 0.49.2
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-15 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml