haml_lint 0.48.0 → 0.49.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93d2cec8a3ce45f370d5e8d055ed8f9dc5a988e2c56e8e145f50710f04f40a3f
-  data.tar.gz: 59a2d93bd2ab520c4fb1288cf85f784d3d20955293b6167f046bffba3f198cac
+  metadata.gz: ccc4d7e3d573b44a76eb95a860b47023cacc016d84a423fab45ed5521ec4c859
+  data.tar.gz: 30df2f2e85a8b5629fc3e7be4d236f899e4a7350520d3fa6ff1ad544e298db81
 SHA512:
-  metadata.gz: be4b59ae43a2cab51fd4148e843177b939da14ee7b0dc40a8ed0d9dd7bbcd12d39d674c1d9c7f19f0a524d912e27fc82b882f6412083eda143c5cf60e218c397
-  data.tar.gz: 28075057ee4c955a4966d2561ff77680b9d90c24e647dc83386dab4ebfabc404cbcb22913836f987896cc506244a4f612f74e131d8838c91f1e0db027d0f8cdd
+  metadata.gz: 31ee68b52d129a92e1ce5b0b08c5c1770cc79cb5fc334ead102b3512b3e01e899b9d4b48f14cfb75d047708c8274d76ef9f76c1c9ea96ce9418fbcc7d90a3d07
+  data.tar.gz: f5723c505efeb8b98c278d9ff6e18c6f04396542f5f45543b3fdde2c622f5431378592a03340cd3040a4ed357ab8e7f216f98c35bf0e65f17c3925e5fab14590

data/config/default.yml

@@ -105,6 +105,9 @@ linters:
   TagName:
     enabled: true
 
+  TrailingEmptyLines:
+    enabled: true
+
   TrailingWhitespace:
     enabled: true
 

data/lib/haml_lint/linter/trailing_empty_lines.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module HamlLint
+  # Checks for trailing empty lines.
+  class Linter::TrailingEmptyLines < Linter
+    include LinterRegistry
+
+    DummyNode = Struct.new(:line)
+
+    def visit_root(root)
+      return if document.source.empty?
+      line_number = document.last_non_empty_line
+
+      node = root.node_for_line(line_number)
+      return if node.disabled?(self)
+
+      return unless document.source.end_with?("\n\n")
+
+      record_lint(line_number, 'Files should not end with trailing empty lines')
+    end
+  end
+end

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -102,7 +102,8 @@ module HamlLint::RubyExtraction
         # that contains interpolation.
         indent = raw_first_line.index(/\S/)
         @ruby_chunks << PlaceholderMarkerChunk.new(node, 'interpolation', indent: indent)
-        add_interpolation_chunks(node, raw_first_line, node.line - 1, indent: indent)
+        lines = extract_piped_plain_multilines(node.line - 1)
+        add_interpolation_chunks(node, lines.join("\n"), node.line - 1, indent: indent)
         return
       end
 
@@ -327,9 +328,16 @@ module HamlLint::RubyExtraction
         # ex: %tag hello #{world}
         # Sadly, the text with interpolation is escaped from the original, but this code
         # needs the original.
-        interpolation_original = @document.unescape_interpolation_to_original_cache[node.script]
 
+        interpolation_original = @document.unescape_interpolation_to_original_cache[node.script]
         line_start_index = @original_haml_lines[node.line - 1].rindex(interpolation_original)
+        if line_start_index.nil?
+          raw_lines = extract_piped_plain_multilines(node.line - 1)
+          equivalent_haml_code = "#{raw_lines.first} #{raw_lines[1..].map(&:lstrip).join(' ')}"
+          line_start_index = equivalent_haml_code.rindex(interpolation_original)
+
+          interpolation_original = raw_lines.join("\n")
+        end
         add_interpolation_chunks(node, interpolation_original, node.line - 1,
                                  line_start_index: line_start_index, indent: indent)
       else
@@ -404,11 +412,14 @@ module HamlLint::RubyExtraction
         # because Haml::Util.balance does a strip...
         interpolated_code = code[char_index...scanner.charpos - 1]
 
-        interpolated_code = "#{' ' * indent}#{script_output_prefix}#{interpolated_code}"
-
         if interpolated_code.include?("\n")
           # We can't correct multiline interpolation.
           # Finding meaningful code to generate and then transfer back is pretty complex
+
+          # Since we can't fix it, strip around the code to reduce RuboCop lints that we won't be able to fix.
+          interpolated_code = interpolated_code.strip
+          interpolated_code = "#{' ' * indent}#{script_output_prefix}#{interpolated_code}"
+
           placeholder_code = interpolated_code.gsub(/\s*\n\s*/, ' ').rstrip
           unless parse_ruby(placeholder_code)
             placeholder_code = interpolated_code.gsub(/\s*\n\s*/, '; ').rstrip
@@ -416,6 +427,7 @@ module HamlLint::RubyExtraction
           @ruby_chunks << AdHocChunk.new(node, [placeholder_code],
                                          haml_line_index: haml_line_index + line_index)
         else
+          interpolated_code = "#{' ' * indent}#{script_output_prefix}#{interpolated_code}"
           @ruby_chunks << InterpolationChunk.new(node, [interpolated_code],
                                                  haml_line_index: haml_line_index + line_index,
                                                  start_char_index: start_char_index,
@@ -433,6 +445,15 @@ module HamlLint::RubyExtraction
       end
     end
 
+    def process_plain_multiline!(line)
+      if line&.end_with?(' |')
+        line[-2..] = ''
+        true
+      else
+        false
+      end
+    end
+
     # Returns the raw lines from the haml for the given index.
     # Multiple lines are returned when a line ends with a comma as that is the only
     # time HAMLs allows Ruby lines to be split.
@@ -517,6 +538,25 @@ module HamlLint::RubyExtraction
       [first_line_offset, ruby_lines]
     end
 
+    def extract_piped_plain_multilines(first_line_index)
+      lines = []
+
+      cur_line = @original_haml_lines[first_line_index].rstrip
+      cur_line_index = first_line_index
+
+      # The pipes must also be on the last line of the multi-line section
+      while cur_line && process_plain_multiline!(cur_line)
+        lines << cur_line
+        cur_line_index += 1
+        cur_line = @original_haml_lines[cur_line_index].rstrip
+      end
+
+      if lines.empty?
+        lines << cur_line
+      end
+      lines
+    end
+
     # Tag attributes actually handle multiline differently than scripts.
     # The basic system basically keeps considering more lines until it meets the closing braces, but still
     # processes pipes too (same as extract_raw_ruby_lines).

data/lib/haml_lint/ruby_parser.rb

@@ -2,7 +2,6 @@
 
 require 'rubocop'
 require 'rubocop/ast/builder'
-require 'parser/current'
 
 module HamlLint
   # Parser for the Ruby language.
@@ -14,10 +13,21 @@ module HamlLint
   class RubyParser
     # Creates a reusable parser.
     def initialize
+      require_parser
       @builder = ::RuboCop::AST::Builder.new
       @parser = ::Parser::CurrentRuby.new(@builder)
     end
 
+    # Require the current parser version while suppressing the
+    # compliancy warning for minor version differences.
+    def require_parser
+      prev = $VERBOSE
+      $VERBOSE = nil
+      require 'parser/current'
+    ensure
+      $VERBOSE = prev
+    end
+
     # Parse the given Ruby source into an abstract syntax tree.
     #
     # @param source [String] Ruby source code

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.49.1
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-09 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -143,6 +143,7 @@ files:
 - lib/haml_lint/linter/space_inside_hash_attributes.rb
 - lib/haml_lint/linter/syntax.rb
 - lib/haml_lint/linter/tag_name.rb
+- lib/haml_lint/linter/trailing_empty_lines.rb
 - lib/haml_lint/linter/trailing_whitespace.rb
 - lib/haml_lint/linter/unnecessary_interpolation.rb
 - lib/haml_lint/linter/unnecessary_string_output.rb
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: HAML lint tool