haml_lint 0.49.2 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c5137a04c59dbfc74fbc6648be0e502ae683e7bca5ff756bab9daf128243cb
-  data.tar.gz: 4b7429295c1a07d73dd3fae058cafba55fdcab05a7113623a5db4d8aed4d7d11
+  metadata.gz: 3c9c0aec66473b6cb72108115d220aeea717f7a524e2c9853629ef17c3269f1a
+  data.tar.gz: 8f8d0d45078fe3249d2ac88740aae782a3e08a1f5e052ca6c9eed8757485cae6
 SHA512:
-  metadata.gz: 0ab868d2be78c9a5fcebc8dd370687fa088deb4b537a64c3ff878e4a8bb4a057a9841c6b0f02914a9ebd791bf19a19e737d9f559e8b12f577c215695ff9b207d
-  data.tar.gz: dbd373708eba214749fc1aa20e42d330c494ac1e3161a71527c956f405e845fb724d312dfa4bfae1bc3c080fe2d972fb75cf9915e1a1c0a808ba4b1ca963be15
+  metadata.gz: 1c3fb6e8ff1a81147eec8d1c1942759a5c19fe71419030762b26c33dbd5f93fc1f2a6c56d3adee626ad7bf22893dc2784bc45ce917d6a0fb95c5bd6f5722402b
+  data.tar.gz: ac0762a3b27f32c55f7167323f429728bd01816d3794af9a574e4af9ceda7c0d19c6d16c7c3d676be255564d98830f41143287cc721f22f64a4562bd00b70ed3

data/config/forced_rubocop_config.yml

@@ -122,6 +122,15 @@ Style/FrozenStringLiteralComment:
 Style/IfUnlessModifier:
   AutoCorrect: false
 
+<% if rubocop_version >= '1.37.0' %>
+# This new cop can trigger on the here-doc we use for filters that contain interpolation.
+# Ex:
+# :javascript
+#   hello #{world} \. bad escape
+Style/RedundantStringEscape:
+  Enabled: false
+<% end %>
+
 # In some case, this cop can cause a change in the spacing.
 # In HAML 5.2, going from (absurd example for clarity):
 #   = 'abc' rescue nil

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.2'
+  VERSION = '0.50.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.49.2
+  version: 0.50.0
 platform: ruby
 authors:
 - Shane da Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -206,7 +206,7 @@ homepage: https://github.com/sds/haml-lint
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,15 +214,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: HAML lint tool
 test_files: []