haml_lint 0.49.1 → 0.49.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccc4d7e3d573b44a76eb95a860b47023cacc016d84a423fab45ed5521ec4c859
-  data.tar.gz: 30df2f2e85a8b5629fc3e7be4d236f899e4a7350520d3fa6ff1ad544e298db81
+  metadata.gz: bd85ce9cb4a413016f9453199aed1366de9cd4fde3d1b0a61a9f56bf33d7b05a
+  data.tar.gz: cde16448577a5fda06012f39d523a7c02bbaf971a798ba0f76217245570d97cc
 SHA512:
-  metadata.gz: 31ee68b52d129a92e1ce5b0b08c5c1770cc79cb5fc334ead102b3512b3e01e899b9d4b48f14cfb75d047708c8274d76ef9f76c1c9ea96ce9418fbcc7d90a3d07
-  data.tar.gz: f5723c505efeb8b98c278d9ff6e18c6f04396542f5f45543b3fdde2c622f5431378592a03340cd3040a4ed357ab8e7f216f98c35bf0e65f17c3925e5fab14590
+  metadata.gz: 53606b8698b377840f21a9dcaf4861e60958a80457a75a0503ecce33fb66170a39a25430a6cacfb34872765f3dd45299048a5a8b09bffe98117c9b7695f4f6b7
+  data.tar.gz: 90ff4f5eb6d627df9447d34dee4326f117316528a0ab08ca22ca3cfaf7560249b7d5bfce10dc88afb0870a62eea7931d60d22cceaa45ebd7a4399feac3895823

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -394,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 '$'
@@ -403,14 +403,16 @@ 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 = code[code_start_char_index...scanner.charpos - 1]
 
         if interpolated_code.include?("\n")
           # We can't correct multiline interpolation.
@@ -430,7 +432,7 @@ module HamlLint::RubyExtraction
           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

data/lib/haml_lint/ruby_extraction/script_chunk.rb

@@ -107,20 +107,22 @@ module HamlLint::RubyExtraction
       statement_start_line_indexes = find_statement_start_line_indexes(to_ruby_lines)
 
       continued_line_indent_delta = 2
+      continued_line_min_indent = 2
 
       cur_line_start_index = nil
       line_start_indexes_that_need_pipes = []
       haml_output_prefix = first_output_haml_prefix
-      to_haml_lines = to_ruby_lines.map.with_index do |line, i|
+      to_haml_lines = to_ruby_lines.map.with_index do |line, i| # rubocop:disable Metrics/BlockLength
         if line !~ /\S/
           # whitespace or empty lines, we don't want any indentation
           ''
         elsif statement_start_line_indexes.include?(i)
           cur_line_start_index = i
           code_start = line.index(/\S/)
+          continued_line_min_indent = code_start + 2
           if line[code_start..].start_with?(script_output_ruby_prefix)
             line = line.sub(script_output_ruby_prefix, '')
-            # The line may have been too indented because of the "HL.out = " prefix
+            # The next lines may have been too indented because of the "HL.out = " prefix
             continued_line_indent_delta = 2 - script_output_ruby_prefix.size
             new_line = "#{line[0...code_start]}#{haml_output_prefix} #{line[code_start..]}"
             haml_output_prefix = '='
@@ -134,7 +136,12 @@ module HamlLint::RubyExtraction
             line_start_indexes_that_need_pipes << cur_line_start_index
           end
 
-          HamlLint::Utils.indent(line, continued_line_indent_delta)
+          line = HamlLint::Utils.indent(line, continued_line_indent_delta)
+          cur_indent = line[/^ */].size
+          if cur_indent < continued_line_min_indent
+            line = HamlLint::Utils.indent(line, continued_line_min_indent - cur_indent)
+          end
+          line
         end
       end
 

data/lib/haml_lint/version.rb

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

metadata

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