haml_lint 0.54.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b017823b15563d033480ee99317c4d0c007624b10ad2ed3b53c254c5686289c8
-  data.tar.gz: cf83ac415fb7749551466fcc0b23a5a2019bbecb99a67b2c54051a78523f1a33
+  metadata.gz: b0bb69db6857a5c9b072203e93e4c9964bd60a9f8e4f1024e4db31453deec8a6
+  data.tar.gz: 94fcce12ae043e72f638d532fcddccfad2de1c8af33a261c37920fa738c4609e
 SHA512:
-  metadata.gz: 17ea23cce399f12712d0f73560553b82068e2ac3be9124c590bbea78948a330811402c15fd2b5f8cbc0b5e8e044bc044e69df78f2e05462580665db814298595
-  data.tar.gz: d619d3018e139b00ce539da9b9f7e1bfef644c71c8e102d146778c3c322770458a16feb89bb44a1a3699eadacc6038c7186407fc8361e6b354f0c4bdbb2dcd57
+  metadata.gz: 973dd46634cfde27066acfcd5d44bebc538716f7ca0d34114b183c19808513fc397b688a66664f6bf1b5ae0367762d4daa7f203d894cd3eb068bcbcfdc12edc5
+  data.tar.gz: ac57887f196f37a3f2f40b77cc5c1e24dd2b29bc29a9d693fc4a675a69ced56f4a49386e2e7a8694cfa04ecbb3ac75bb4fb412c760a0a9fe83d2d20b7bdef40a

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -247,31 +247,29 @@ module HamlLint::RubyExtraction
     def visit_tag(node)
       indent = @original_haml_lines[node.line - 1].index(/\S/)
 
+      @ruby_chunks << PlaceholderMarkerChunk.new(node, 'tag', indent: indent)
+
+      current_line_index = visit_tag_attributes(node, indent: indent)
+      visit_tag_script(node, line_index: current_line_index, indent: indent)
+
       # We don't want to use a block because assignments in a block are local to that block,
       # 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'
-      @ruby_chunks << AdHocChunk.new(node,
-                                     [' ' * indent + code])
-      indent += 2
-
-      tag_chunk = PlaceholderMarkerChunk.new(node, 'tag', indent: indent)
-      @ruby_chunks << tag_chunk
+      begin_chunk = AdHocChunk.new(node, [' ' * indent + code])
+      @ruby_chunks << begin_chunk
 
-      current_line_index = visit_tag_attributes(node, indent: indent)
-      visit_tag_script(node, line_index: current_line_index, indent: indent)
+      indent += 2
 
       yield
 
       indent -= 2
 
-      if @ruby_chunks.last.equal?(tag_chunk)
+      if @ruby_chunks.last.equal?(begin_chunk)
         # So there is nothing going "in" the tag, remove the wrapping "begin" and replace the PlaceholderMarkerChunk
         # by one less indented
         @ruby_chunks.pop
-        @ruby_chunks.pop
-        @ruby_chunks << PlaceholderMarkerChunk.new(node, 'tag', indent: indent)
       else
         @ruby_chunks << AdHocChunk.new(node,
                                        [' ' * indent + 'ensure', ' ' * indent + '  HL.noop', ' ' * indent + 'end'],
@@ -600,9 +598,12 @@ module HamlLint::RubyExtraction
         return [char_index, [haml_processed_ruby_code]]
       end
 
-      min_non_white_chars_to_add = haml_processed_ruby_code.scan(/\S/).size
+      # The +1 is for the closing brace, which we need
+      min_non_white_chars_to_add = haml_processed_ruby_code.scan(/\S/).size + 1
 
-      regexp = HamlLint::Utils.regexp_for_parts(haml_processed_ruby_code.split(/\s+/), '\\s+')
+      regexp = HamlLint::Utils.regexp_for_parts(
+        haml_processed_ruby_code.split(/\s+/), '\\s+', prefix: '\s*', suffix: '\s*(?=[)}])'
+      )
 
       joined_lines = first_line.rstrip
       process_multiline!(joined_lines)
@@ -624,7 +625,7 @@ module HamlLint::RubyExtraction
 
       first_line_offset = match.begin(0)
       raw_ruby = match[0]
-      ruby_lines = raw_ruby.split("\n")
+      ruby_lines = raw_ruby.split("\n", -1)
 
       [first_line_offset, ruby_lines]
     end

data/lib/haml_lint/runner.rb

@@ -137,14 +137,14 @@ module HamlLint
     # @return [Array<HamlLint::Source>]
     def extract_applicable_sources(config, options)
       if options[:stdin]
-        [HamlLint::Source.new($stdin, options[:stdin])]
+        [HamlLint::Source.new(io: $stdin, path: options[:stdin])]
       else
         included_patterns = options[:files]
         excluded_patterns = config['exclude']
         excluded_patterns += options.fetch(:excluded_files, [])
 
         HamlLint::FileFinder.new(config).find(included_patterns, excluded_patterns).map do |file_path|
-          HamlLint::Source.new File.new(file_path), file_path
+          HamlLint::Source.new path: file_path
         end
       end
     end

data/lib/haml_lint/source.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
 module HamlLint
-  # Wrapper class representing a single target for HamlLint::Runner to run against, comprised of an IO object
-  # containing haml code, as well as a file path.
+  # Wrapper class representing a single target for HamlLint::Runner to run against, comprised of a file path to
+  # eventually read from, and an optional IO argument to override with.
   class Source
     # @return [String] File path associated with the given IO object.
     attr_reader :path
 
-    # Wraps an IO object and file path to a source object.
+    # Wraps an optional IO object and file path to a source object.
     #
-    # @param [IO] io
     # @param [String] path
-    def initialize(io, path)
-      @io = io
+    # @param [IO] io
+    def initialize(path: nil, io: nil)
       @path = path
+      @io = io
     end
 
     # @return [String] Contents of the given IO object.
     def contents
-      @contents ||= @io.read
+      @contents ||= @io&.read || File.read(path)
     end
   end
 end

data/lib/haml_lint/spec/shared_rubocop_autocorrect_context.rb

@@ -115,7 +115,7 @@ module HamlLint
 
           syntax_lints = subject.lints.select { |lint| lint.message =~ %r{Lint/Syntax} }
 
-          if start_ruby.strip != 'SKIP' && subject.last_extracted_source
+          if start_ruby.strip != 'SKIP' && subject.last_extracted_source && ENV['UPDATE_EXAMPLES'] != '1'
             matcher = eq(start_ruby)
             subject.last_extracted_source.source.should(
               matcher,
@@ -125,7 +125,7 @@ module HamlLint
 
           syntax_lints.should(be_empty, "Generated Ruby has Syntax Lints:\n#{format_lints(syntax_lints)}")
 
-          if end_ruby.strip != 'SKIP' && subject.last_new_ruby_source
+          if end_ruby.strip != 'SKIP' && subject.last_new_ruby_source && ENV['UPDATE_EXAMPLES'] != '1'
             matcher = eq(end_ruby)
             subject.last_new_ruby_source.should(
               matcher,
@@ -141,10 +141,40 @@ module HamlLint
             -> { "Final HAML is different from expected. #{matcher.failure_message}\n#{format_lints}" }
           )
 
-          if subject.last_extracted_source && start_ruby.strip != 'SKIP'
+          if subject.last_extracted_source && start_ruby.strip != 'SKIP' && ENV['UPDATE_EXAMPLES'] != '1'
             subject.last_extracted_source.source_map.should == source_map
           end
 
+          if ENV['UPDATE_EXAMPLES'] == '1' && respond_to?(:example_first_line_no) &&
+              start_ruby.strip != 'SKIP' && end_ruby.strip != 'SKIP'
+            original_content = File.read(example_path)
+            old_steps_string = '---' + steps_string.partition('---').last.rpartition('---').first + '---'
+
+            if old_steps_string.scan(/\$\$\d+/).tally.values.any? { |v| v > 1 }
+              # If the $$3 was there twice, let's not update the example
+              return
+            end
+            original_content.scan(old_steps_string).count
+
+            new_generated_ruby_lines = subject.last_extracted_source.source.split("\n", -1)
+            last_seen_haml_line_no = 1
+            subject.last_extracted_source.source_map.each do |ruby_line_no, haml_line_no|
+              if haml_line_no != last_seen_haml_line_no
+                last_seen_haml_line_no = haml_line_no
+                new_generated_ruby_lines[ruby_line_no - 1] += " $$#{haml_line_no}"
+              end
+            end
+
+            new_steps_string = <<~NEW.chop # Chop to remove the added newlines
+              ---
+              #{new_generated_ruby_lines.join("\n")}---
+              #{subject.last_new_ruby_source}---
+            NEW
+
+            new_content = original_content.gsub(old_steps_string, new_steps_string)
+            File.write(example_path, new_content)
+          end
+
           haml_different = start_haml != end_haml
           document.source_was_changed.should == haml_different
         end

data/lib/haml_lint/utils.rb

@@ -277,8 +277,9 @@ module HamlLint
       $stdin = original_stdin
     end
 
-    def regexp_for_parts(parts, join_regexp)
+    def regexp_for_parts(parts, join_regexp, prefix: nil, suffix: nil)
       regexp_code = parts.map { |c| Regexp.quote(c) }.join(join_regexp)
+      regexp_code = "#{prefix}#{regexp_code}#{suffix}"
       Regexp.new(regexp_code)
     end
   end

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.54.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-23 00:00:00.000000000 Z
+date: 2024-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml