haml_lint 0.49.1 → 0.49.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccc4d7e3d573b44a76eb95a860b47023cacc016d84a423fab45ed5521ec4c859
-  data.tar.gz: 30df2f2e85a8b5629fc3e7be4d236f899e4a7350520d3fa6ff1ad544e298db81
+  metadata.gz: 95c5137a04c59dbfc74fbc6648be0e502ae683e7bca5ff756bab9daf128243cb
+  data.tar.gz: 4b7429295c1a07d73dd3fae058cafba55fdcab05a7113623a5db4d8aed4d7d11
 SHA512:
-  metadata.gz: 31ee68b52d129a92e1ce5b0b08c5c1770cc79cb5fc334ead102b3512b3e01e899b9d4b48f14cfb75d047708c8274d76ef9f76c1c9ea96ce9418fbcc7d90a3d07
-  data.tar.gz: f5723c505efeb8b98c278d9ff6e18c6f04396542f5f45543b3fdde2c622f5431378592a03340cd3040a4ed357ab8e7f216f98c35bf0e65f17c3925e5fab14590
+  metadata.gz: 0ab868d2be78c9a5fcebc8dd370687fa088deb4b537a64c3ff878e4a8bb4a057a9841c6b0f02914a9ebd791bf19a19e737d9f559e8b12f577c215695ff9b207d
+  data.tar.gz: dbd373708eba214749fc1aa20e42d330c494ac1e3161a71527c956f405e845fb724d312dfa4bfae1bc3c080fe2d972fb75cf9915e1a1c0a808ba4b1ca963be15

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

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module HamlLint
-  VERSION = '0.49.1'
+  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.1
+  version: 0.49.2
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml