haml_lint 0.69.0 → 0.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43c9ee2b963d529fd6fac9ac7da3b0c8250ce9127780a695e3d9019e172d55c4
-  data.tar.gz: 4cbddbf3128a6ab2430e21b02f119ba7c58bbb576a9a73556ad6c9ef269926f5
+  metadata.gz: 7b1a2ca29afbb8764cf0932d560901cd9b2af889701386bf398a464b94d331bc
+  data.tar.gz: 82e6c7e54a0bd3c1d8f4159893af0bfb0c16c81dca993a9aaf6e875544d79269
 SHA512:
-  metadata.gz: d28e0a5dc9d957b5b1101e5378d45c6eddcf91257907933990050323fb36c960123255c9c5b8a9563ce78b1dd5cd0d74c35499954bed9098335887c5e10b0568
-  data.tar.gz: 51d29f51cec99314e3b98aa620ee7754f924d3c224eeabe8fa8ce9d0cbb968759161feb29e496dd6716e84e732780375cf43e04e5b045a31180d5d493e5ed44c
+  metadata.gz: 754e6ad2de8723a619eb4b24204e8231fead3443c35080c073fbc8e68a15cadace16eb5635c86bea78eee28831de1ef4ba8afadc4e22156f4c6edd6155df42b7
+  data.tar.gz: f533a65a21402e75970431c7e82b7b82f111b12d584568b8fd38ff25fd21d258c76e81d562c7b23d439fe1055f01f95897fbc1bc787cc599b8430baa30260857

data/lib/haml_lint/linter/rubocop.rb

@@ -94,7 +94,7 @@ module HamlLint
       @last_extracted_source = nil
       @last_new_ruby_source = nil
 
-      coordinator = HamlLint::RubyExtraction::Coordinator.new(document)
+      coordinator = HamlLint::RubyExtraction::Coordinator.new(document, autocorrect: @autocorrect)
 
       extracted_source = coordinator.extract_ruby_source
       if ENV['HAML_LINT_INTERNAL_DEBUG'] == 'true'

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -9,7 +9,7 @@ module HamlLint::RubyExtraction
   class ChunkExtractor
     include HamlLint::HamlVisitor
 
-    attr_reader :script_output_prefix
+    attr_reader :script_output_prefix, :autocorrect
 
     HAML_PARSER_INSTANCE = if Haml::VERSION >= '5.0.0'
                              ::Haml::Parser.new({})
@@ -21,9 +21,10 @@ module HamlLint::RubyExtraction
     # We don't. So the regex must be fixed to correctly detect the start of the string.
     BLOCK_KEYWORD_REGEX = Regexp.new(Haml::Parser::BLOCK_KEYWORD_REGEX.source.sub('^', '\A'))
 
-    def initialize(document, script_output_prefix:)
+    def initialize(document, script_output_prefix:, autocorrect: nil)
       @document = document
       @script_output_prefix = script_output_prefix
+      @autocorrect = autocorrect
     end
 
     def extract
@@ -637,8 +638,20 @@ module HamlLint::RubyExtraction
     def wrap_lines(lines, wrap_depth)
       lines = lines.dup
       wrapping_prefix = 'W' * (wrap_depth - 1) + '('
-      lines[0] = wrapping_prefix + lines[0]
-      lines[-1] = lines[-1] + ')'
+
+      # Strip leading/trailing space only when linting (not autocorrecting) to avoid
+      # SpaceInsideParens violations. During autocorrect, preserve spaces so RuboCop
+      # can fix them and map corrections back correctly.
+      if autocorrect
+        lines[0] = wrapping_prefix + lines[0]
+        lines[-1] = lines[-1] + ')'
+      else
+        leading_spaces = lines[0][/^\s*/].length
+        wrapping_prefix = 'W' * (wrap_depth - 1 + leading_spaces) + '('
+        lines[0] = wrapping_prefix + lines[0].lstrip
+        lines[-1] = lines[-1].rstrip + ')'
+      end
+
       lines
     end
 

data/lib/haml_lint/ruby_extraction/coordinator.rb

@@ -28,8 +28,12 @@ module HamlLint::RubyExtraction
     # @return [Array<String>] The ruby lines after correction by RuboCop
     attr_reader :corrected_ruby_lines
 
-    def initialize(document)
+    # @return [Symbol, nil] The autocorrect mode (:safe, :all, or nil)
+    attr_reader :autocorrect
+
+    def initialize(document, autocorrect:)
       @document = document
+      @autocorrect = autocorrect
       @ruby_chunks = nil
       @assembled_ruby_lines = nil
       @corrected_ruby_lines = nil
@@ -46,7 +50,8 @@ module HamlLint::RubyExtraction
       pick_a_script_output_prefix
 
       @ruby_chunks = HamlLint::RubyExtraction::ChunkExtractor.new(@document,
-                                                                  script_output_prefix: @script_output_prefix).extract
+                                                                  script_output_prefix: @script_output_prefix,
+                                                                  autocorrect: autocorrect).extract
       preprocess_chunks
 
       @assembled_ruby_lines = []

data/lib/haml_lint/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.69.0
+  version: 0.70.0
 platform: ruby
 authors:
 - Shane da Silva