haml_lint 0.46.0 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b477cda9580216bbcc7434f0673bd4e8b36fa53cc22695cce4b25d5082921b5f
-  data.tar.gz: 8d404a3975a3def789672a4629b4bddb38a7b110083a731b801329369fae773b
+  metadata.gz: e7a818da3ed1d58db0ad35b864c6c90d8036173109f6609da452da8b496dd1d5
+  data.tar.gz: ca045650d3373d2fa48d840c684c14b3d46a497f39e91eb9058b1827f3bd74b7
 SHA512:
-  metadata.gz: 3e5a3e1b34815a356db1eb4ac1f10ca00e7d083a46f7b69cd8d3223ba6785d34eb628737ebd14d1b9867141bec328385794e329e096452df2b8c2868d42c4801
-  data.tar.gz: 2f27a33785a9f920359767524ab741bcc1edfaf8e52f3b469e264747e7ecf9f5861db308d33efc074634763889c499c187faa0ce8d455eee5618dfa6323d9f5b
+  metadata.gz: 0e2d83720d795e4589d534087c4db2be681eeae95cecda6432917345dea5e4c59e8ba7d65633fb2d4cd0ea86eafc0ea89b8fc51f994cc0b7973a50b0fa0a0abd
+  data.tar.gz: 11fc0ea04b7dae506bb0e264d204bdcdcaa96a65230ade8416ae56094a46f95deb3a1006200919804769dcc1c7adf7ab407bbfdf863355248eea9b0e7858308a

data/config/forced_rubocop_config.yml

@@ -45,6 +45,21 @@ Layout/EndAlignment:
 Layout/EndOfLine:
   Enabled: false
 
+# Turning this cop on can turn
+# = content_tag(:span) do
+#   - foo
+#   - bar
+#
+# Into
+# - HL.out =
+#   - content_tag(:span) do
+#     - foo
+#     - bar
+#
+# Which is wrong... It would take too much analysis to detect and fix that situation.
+Layout/MultilineAssignmentLayout:
+  Enabled: false
+
 Layout/ParameterAlignment:
   # The alternative, with_fixed_indentation, breaks because we sometimes remove indentation when
   # dealing with multi-line scripts. (Because a line starting with "=" adds a "HL.out = " to the

data/lib/haml_lint/linter/rubocop.rb

@@ -52,11 +52,6 @@ module HamlLint
         return
       end
 
-      user_config_path = ENV['HAML_LINT_RUBOCOP_CONF'] || config['config_file']
-      user_config_path ||= self.class.rubocop_config_store.user_rubocop_config_path_for(document.file)
-      user_config_path = File.absolute_path(user_config_path)
-      @rubocop_config = self.class.rubocop_config_store.config_object_pointing_to(user_config_path)
-
       @last_extracted_source = nil
       @last_new_ruby_source = nil
 
@@ -102,6 +97,13 @@ module HamlLint
 
     private
 
+    def rubocop_config_for(path)
+      user_config_path = ENV['HAML_LINT_RUBOCOP_CONF'] || config['config_file']
+      user_config_path ||= self.class.rubocop_config_store.user_rubocop_config_path_for(path)
+      user_config_path = File.absolute_path(user_config_path)
+      self.class.rubocop_config_store.config_object_pointing_to(user_config_path)
+    end
+
     # Extracted here so that tests can stub this to always return true
     def transfer_corrections?(initial_ruby_code, new_ruby_code)
       initial_ruby_code != new_ruby_code
@@ -205,7 +207,7 @@ module HamlLint
     def run_rubocop(rubocop_cli, ruby_code, path) # rubocop:disable Metrics
       rubocop_status = nil
       stdout_str, stderr_str = HamlLint::Utils.with_captured_streams(ruby_code) do
-        rubocop_cli.config_store.instance_variable_set(:@options_config, @rubocop_config)
+        rubocop_cli.config_store.instance_variable_set(:@options_config, rubocop_config_for(path))
         rubocop_status = rubocop_cli.run(rubocop_flags + ['--stdin', path])
       end
 
@@ -332,7 +334,7 @@ module HamlLint
     # anymore or don't exist yet.
     # This is not exhaustive, it's only for the cops that are in config/default.yml
     def ignored_cops_flags
-      ignored_cops = config['ignored_cops']
+      ignored_cops = config.fetch('ignored_cops', [])
 
       if @autocorrect
         ignored_cops += self.class.cops_names_not_supporting_autocorrect

data/lib/haml_lint/linter.rb

@@ -112,8 +112,11 @@ module HamlLint
     #
     # @return [AST::Node]
     def parse_ruby(source)
+      self.class.ruby_parser.parse(source)
+    end
+
+    def self.ruby_parser # rubocop:disable Lint/IneffectiveAccessModifier
       @ruby_parser ||= HamlLint::RubyParser.new
-      @ruby_parser.parse(source)
     end
 
     # Remove the surrounding double quotes from a string, ignoring any

data/lib/haml_lint/ruby_extraction/ad_hoc_chunk.rb

@@ -16,5 +16,9 @@ module HamlLint::RubyExtraction
     end
 
     def transfer_correction(coordinator, all_corrected_ruby_lines, haml_lines); end
+
+    def skip_line_indexes_in_source_map
+      (0...@ruby_lines.size).to_a
+    end
   end
 end

data/lib/haml_lint/ruby_extraction/base_chunk.rb

@@ -78,7 +78,8 @@ module HamlLint::RubyExtraction
     end
 
     def haml_end_line_index
-      @haml_line_index + nb_haml_lines - 1
+      # the .max is needed to handle cases with 0 nb_haml_lines
+      [@haml_line_index + nb_haml_lines - 1, @haml_line_index].max
     end
 
     def nb_haml_lines

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -190,7 +190,7 @@ module HamlLint::RubyExtraction
         # so the semantics of the extracted ruby would be different from the one generated by
         # Haml. Those differences can make some cops, such as UselessAssignment, have false
         # positives
-        code = 'begin # rubocop:disable Style/RedundantBegin,Lint/RedundantCopDisableDirective'
+        code = 'begin'
         @ruby_chunks << AdHocChunk.new(node,
                                        [' ' * indent + code])
         indent += 2
@@ -204,7 +204,8 @@ module HamlLint::RubyExtraction
       if has_children
         yield
         indent -= 2
-        @ruby_chunks << AdHocChunk.new(node, [' ' * indent + 'end'],
+        @ruby_chunks << AdHocChunk.new(node,
+                                       [' ' * indent + 'ensure', ' ' * indent + '  HL.noop', ' ' * indent + 'end'],
                                        haml_line_index: @ruby_chunks.last.haml_end_line_index)
       end
     end
@@ -425,6 +426,10 @@ module HamlLint::RubyExtraction
       regexp = Regexp.new(regexp_code)
 
       match = raw_haml.match(regexp)
+      # This can happen when pipes are used as marker for multiline parts, and when tag attributes change lines
+      # without ending by a comma. This is quite a can of worm and is probably not too frequent, so for now,
+      # these cases are not supported.
+      return if match.nil?
 
       raw_ruby = match[0]
       ruby_lines = raw_ruby.split("\n")

data/lib/haml_lint/spec/shared_rubocop_autocorrect_context.rb

@@ -32,6 +32,19 @@ module HamlLint
           false
         end
 
+        let(:supported_haml?) do |example|
+          # Tries to match `{% haml_version >= '5' %}`, extracting the operator and the "number"
+          haml_version_regex = /\{%\s*haml_version\s*([^\w\s]+?)\s*['"]?(\d+(\.\d+)*)['"]?\s*%\}/
+          requirements = example.metadata[:full_description].scan(haml_version_regex)
+
+          # This can be used by the requirements in eval
+          haml_version = HamlLint::VersionComparer.for_haml
+
+          requirements.all? do |(operator, version)|
+            haml_version.send(operator, version)
+          end
+        end
+
         before do
           if stub_rubocop?
             skip if end_ruby.include?('SKIP')
@@ -92,6 +105,8 @@ module HamlLint
         # 4) the corrected haml
         # Each steps is delimited by a line with ---
         def follows_steps # rubocop:disable Metrics
+          skip unless supported_haml?
+
           begin
             subject.run_or_raise(document, autocorrect: autocorrect)
           rescue StandardError => e

data/lib/haml_lint/version.rb

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

metadata

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