haml_lint 0.56.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0bb69db6857a5c9b072203e93e4c9964bd60a9f8e4f1024e4db31453deec8a6
-  data.tar.gz: 94fcce12ae043e72f638d532fcddccfad2de1c8af33a261c37920fa738c4609e
+  metadata.gz: 6962d4b0d9f7f60b473641303f1ef1b8962797bf7abdeb8db4e57b36df65f7d3
+  data.tar.gz: 214c0ccb902d9c742af8df5f4e65fc221f6ae9bec572b7a535df0ee682b5dfac
 SHA512:
-  metadata.gz: 973dd46634cfde27066acfcd5d44bebc538716f7ca0d34114b183c19808513fc397b688a66664f6bf1b5ae0367762d4daa7f203d894cd3eb068bcbcfdc12edc5
-  data.tar.gz: ac57887f196f37a3f2f40b77cc5c1e24dd2b29bc29a9d693fc4a675a69ced56f4a49386e2e7a8694cfa04ecbb3ac75bb4fb412c760a0a9fe83d2d20b7bdef40a
+  metadata.gz: b161dc044d6a5a22be918384f7cde7b0fd9b20dc2f4408f4a535ae72ed0b7fab75b96f885db83e92ae4cce769b811118978412bbba819e6f38178fb261f040f1
+  data.tar.gz: fb2af5b891147f8588cf9ffcd17fccc7ef0674bf11127327addbca55c9a8c094c6e53f8f268550dc160955d4c1c889948d7285fc39027287781d3abba7f66873

data/lib/haml_lint/linter/empty_script.rb

@@ -6,7 +6,7 @@ module HamlLint
     include LinterRegistry
 
     def visit_silent_script(node)
-      return unless node.script =~ /\A\s*\Z/
+      return unless /\A\s*\Z/.match?(node.script)
 
       record_lint(node, 'Empty script should be removed')
     end

data/lib/haml_lint/linter/id_names.rb

@@ -24,7 +24,7 @@ module HamlLint
 
       style = config['style'] || 'lisp_case'
       matcher = STYLES[style]
-      record_lint(node, "`id` attribute must be in #{STYLIZED_NAMES[style]}") unless id =~ matcher
+      record_lint(node, "`id` attribute must be in #{STYLIZED_NAMES[style]}") unless id&.match?(matcher)
     end
   end
 end

data/lib/haml_lint/linter/indentation.rb

@@ -30,7 +30,7 @@ module HamlLint
       dummy_node = Struct.new(:line)
 
       document.source_lines.each_with_index do |line, index|
-        next if line =~ regex
+        next if line&.match?(regex)
 
         unless root.node_for_line(index).disabled?(self)
           record_lint dummy_node.new(index + 1), "Line contains #{wrong_characters} in indentation"

data/lib/haml_lint/linter/leading_comment_space.rb

@@ -8,7 +8,7 @@ module HamlLint
     def visit_haml_comment(node)
       # Skip if the node spans multiple lines starting on the second line,
       # or starts with a space
-      return if node.text =~ /\A#*(\s*|\s+\S.*)$/
+      return if /\A#*(\s*|\s+\S.*)$/.match?(node.text)
 
       record_lint(node, 'Comment should have a space after the `#`')
     end

data/lib/haml_lint/linter/space_inside_hash_attributes.rb

@@ -27,8 +27,8 @@ module HamlLint
       style = STYLE[config['style'] == 'no_space' ? 'no_space' : 'space']
       source = node.hash_attributes_source
 
-      record_lint(node, style[:start_message]) unless source =~ style[:start_regex]
-      record_lint(node, style[:end_message]) unless source =~ style[:end_regex]
+      record_lint(node, style[:start_message]) unless source&.match?(style[:start_regex])
+      record_lint(node, style[:end_message]) unless source&.match?(style[:end_regex])
     end
   end
 end

data/lib/haml_lint/linter/tag_name.rb

@@ -7,7 +7,7 @@ module HamlLint
 
     def visit_tag(node)
       tag = node.tag_name
-      return unless tag =~ /[A-Z]/
+      return unless /[A-Z]/.match?(tag)
 
       record_lint(node, "`#{tag}` should be written in lowercase as `#{tag.downcase}`")
     end

data/lib/haml_lint/linter/trailing_whitespace.rb

@@ -9,7 +9,7 @@ module HamlLint
 
     def visit_root(root)
       document.source_lines.each_with_index do |line, index|
-        next unless line =~ /\s+$/
+        next unless /\s+$/.match?(line)
 
         node = root.node_for_line(index + 1)
         unless node.disabled?(self)

data/lib/haml_lint/linter/unnecessary_string_output.rb

@@ -22,7 +22,7 @@ module HamlLint
     def visit_script(node)
       # Some script nodes created by the HAML parser aren't actually script
       # nodes declared via the `=` marker. Check for it.
-      return if node.source_code !~ /\A\s*=/
+      return unless /\A\s*=/.match?(node.source_code)
 
       if outputs_string_literal?(node)
         record_lint(node, MESSAGE)

data/lib/haml_lint/linter.rb

@@ -37,7 +37,7 @@ module HamlLint
           :error
         )
     rescue StandardError => e
-      msg = "Couldn't process the file".dup
+      msg = +"Couldn't process the file"
       if @autocorrect
         # Those lints related to auto-correction were not saved, so don't display them
         @lints = []
@@ -231,7 +231,7 @@ module HamlLint
       # excess whitespace
       @document.source_lines[(tag_node.line - 1)...(following_node_line(tag_node) - 1)]
                .map do |line|
-        line.strip.gsub(/\|\z/, '').rstrip
+        line.strip.delete_suffix('|').rstrip
       end.join(' ')
     end
   end

data/lib/haml_lint/reporter/github_reporter.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: false
+
+module HamlLint
+  # Outputs GitHub workflow commands for GitHub check annotations when run within GitHub actions.
+  class Reporter::GithubReporter < Reporter
+    ESCAPE_MAP = { '%' => '%25', "\n" => '%0A', "\r" => '%0D' }.freeze
+
+    include Reporter::Utils
+
+    def added_lint(lint, report)
+      if lint.severity >= report.fail_level
+        print_workflow_command(lint: lint)
+      else
+        print_workflow_command(severity: 'warning', lint: lint)
+      end
+    end
+
+    def display_report(report)
+      print_summary(report)
+    end
+
+    private
+
+    def print_workflow_command(lint:, severity: 'error')
+      log.log "::#{severity} file=#{lint.filename},line=#{lint.line}::#{github_escape(lint.message)}"
+    end
+
+    def github_escape(string)
+      string.gsub(Regexp.union(ESCAPE_MAP.keys), ESCAPE_MAP)
+    end
+  end
+end

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -17,6 +17,10 @@ module HamlLint::RubyExtraction
                              ::Haml::Parser.new('', {})
                            end
 
+    # HAML strips newlines when handling multi-line statements (using pipes or trailing comma)
+    # 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:)
       @document = document
       @script_output_prefix = script_output_prefix
@@ -390,7 +394,7 @@ module HamlLint::RubyExtraction
         # is indented by 0.
         lines = node.text.split("\n")
         lines.map! do |line|
-          if line !~ /\S/
+          if !/\S/.match?(line)
             # whitespace or empty
             ''
           else
@@ -546,7 +550,7 @@ module HamlLint::RubyExtraction
       joined_lines = lines.join("\n")
 
       if haml_processed_ruby_code.include?("\n")
-        haml_processed_ruby_code = haml_processed_ruby_code.gsub("\n", ' ')
+        haml_processed_ruby_code = haml_processed_ruby_code.tr("\n", ' ')
       end
 
       haml_processed_ruby_code.split(/[, ]/)
@@ -692,7 +696,7 @@ module HamlLint::RubyExtraction
         return keyword
       end
 
-      return unless keyword = code.scan(Haml::Parser::BLOCK_KEYWORD_REGEX)[0]
+      return unless keyword = code.scan(BLOCK_KEYWORD_REGEX)[0]
       keyword[0] || keyword[1]
     end
   end

data/lib/haml_lint/ruby_extraction/non_ruby_filter_chunk.rb

@@ -14,7 +14,7 @@ module HamlLint::RubyExtraction
       to_content_lines = to_ruby_lines[1...-1]
 
       to_haml_lines = to_content_lines.map do |line|
-        if line !~ /\S/
+        if !/\S/.match?(line)
           # whitespace or empty
           ''
         else

data/lib/haml_lint/ruby_extraction/ruby_filter_chunk.rb

@@ -19,7 +19,7 @@ module HamlLint::RubyExtraction
       haml_lines[@haml_line_index - 1] = HamlLint::Utils.indent(haml_lines[@haml_line_index - 1], delta_indent)
 
       to_haml_lines = to_ruby_lines.map do |line|
-        if line !~ /\S/
+        if !/\S/.match?(line)
           # whitespace or empty
           ''
         else

data/lib/haml_lint/ruby_extraction/script_chunk.rb

@@ -113,7 +113,7 @@ module HamlLint::RubyExtraction
       line_start_indexes_that_need_pipes = []
       haml_output_prefix = first_output_haml_prefix
       to_haml_lines = to_ruby_lines.map.with_index do |line, i| # rubocop:disable Metrics/BlockLength
-        if line !~ /\S/
+        if !/\S/.match?(line)
           # whitespace or empty lines, we don't want any indentation
           ''
         elsif statement_start_line_indexes.include?(i)

data/lib/haml_lint/spec/shared_rubocop_autocorrect_context.rb

@@ -74,7 +74,7 @@ module HamlLint
           current_matching_line = 1
           @source_map = {}
           lines.each.with_index do |line, i|
-            next unless line =~ /\S/
+            next unless /\S/.match?(line)
             mo = line.match(/^(.*?)\$?\s*\$\$(\d+)$/)
             if mo
               lines[i] = mo[1]

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.56.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-04 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -153,6 +153,7 @@ files:
 - lib/haml_lint/reporter/checkstyle_reporter.rb
 - lib/haml_lint/reporter/default_reporter.rb
 - lib/haml_lint/reporter/disabled_config_reporter.rb
+- lib/haml_lint/reporter/github_reporter.rb
 - lib/haml_lint/reporter/hash_reporter.rb
 - lib/haml_lint/reporter/hooks.rb
 - lib/haml_lint/reporter/json_reporter.rb
@@ -215,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: HAML lint tool