haml_lint 0.70.0 → 0.71.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1a2ca29afbb8764cf0932d560901cd9b2af889701386bf398a464b94d331bc
-  data.tar.gz: 82e6c7e54a0bd3c1d8f4159893af0bfb0c16c81dca993a9aaf6e875544d79269
+  metadata.gz: afe284adb597f41b6999969d0d0220146f80e9899cb71101e9de112bf4f79f80
+  data.tar.gz: 225845ad81e2517e0c295e41310ce1edbe0581a823bc8985225dc0699d9e8527
 SHA512:
-  metadata.gz: 754e6ad2de8723a619eb4b24204e8231fead3443c35080c073fbc8e68a15cadace16eb5635c86bea78eee28831de1ef4ba8afadc4e22156f4c6edd6155df42b7
-  data.tar.gz: f533a65a21402e75970431c7e82b7b82f111b12d584568b8fd38ff25fd21d258c76e81d562c7b23d439fe1055f01f95897fbc1bc787cc599b8430baa30260857
+  metadata.gz: e6f8b34ad2587598c1c5c72b3b394d17b7d791c025b601437ffdab437ed7d8470fb54a28033d490da70deb3202827cc54e7acb6ec5d0a80b9fca6936396e5f98
+  data.tar.gz: 634e4e861509306b3fb9da905b9557eb61ea0ff11b1427b0c3f62b4450c723af48eb1d27dfc1c568181a1053ba52dcb286ffaefe94c377ae1e1b5430754dc3b5

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, autocorrect: @autocorrect)
+      coordinator = HamlLint::RubyExtraction::Coordinator.new(document)
 
       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, :autocorrect
+    attr_reader :script_output_prefix
 
     HAML_PARSER_INSTANCE = if Haml::VERSION >= '5.0.0'
                              ::Haml::Parser.new({})
@@ -21,10 +21,9 @@ 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:, autocorrect: nil)
+    def initialize(document, script_output_prefix:)
       @document = document
       @script_output_prefix = script_output_prefix
-      @autocorrect = autocorrect
     end
 
     def extract
@@ -638,20 +637,8 @@ module HamlLint::RubyExtraction
     def wrap_lines(lines, wrap_depth)
       lines = lines.dup
       wrapping_prefix = 'W' * (wrap_depth - 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[0] = wrapping_prefix + lines[0]
+      lines[-1] = lines[-1] + ')'
       lines
     end
 

data/lib/haml_lint/ruby_extraction/coordinator.rb

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

data/lib/haml_lint/version.rb

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

metadata

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