haml_lint 0.40.0 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ef9ca7cc6bbd3b5f9663a2bda75669062b25efeb53af9e32cf152fd7f5aee6c
-  data.tar.gz: 35e34d39d55e13910ec90f9ee7ece9a4baa2d6bc44f2f6962b230f6387519174
+  metadata.gz: 45d676ecd18fa32156a84c6f6d2c5a062a3a74fc8bacfc5ae6ec9e2b2c5436a7
+  data.tar.gz: '038b1f81556d35a4c6037b2ec5e08428465f8d09258d3c603a3ee7cbaf4f1f55'
 SHA512:
-  metadata.gz: 376df9f9c0de3c0949bd2187bb1ba9f3bc5e381644a93c827ca085125ac2922f59f98d048d8bf548b379ebe5def5180f9b182628030f4e66454f3edf71478f9f
-  data.tar.gz: fa1a9ad202224e1059dd7802b1aea08db8b9d11570feca891a31650dc3b10f0b991b2585ad27faa4425bc2165a2b23e799075c944250a43568e1d17c7f83f8b1
+  metadata.gz: e69de9bbae167b9f61818498b008dfb4789a41d7b9753b04035951c544385d160e69ccde08dee04ee2a7a786efc14f4657ed468935056ade34fcf0d185d82167
+  data.tar.gz: dc2e034a37c3fb7ede287d16d83b1cdbfbc1597ee5ba96c59571b9b975585112d36880a228d9ea35585a958694d7f322e965f4d927d95de167dd5399cf93417c

data/config/default.yml

@@ -97,6 +97,7 @@ linters:
       - Layout/CaseIndentation
       - Layout/ElseAlignment
       - Layout/EndOfLine
+      - Layout/FirstHashElementIndentation
       - Layout/HashAlignment
       - Layout/IndentationWidth
       - Layout/LineLength # renamed from Metrics/LineLength in rubocop 0.79.0

data/lib/haml_lint/adapter/haml_4.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module HamlLint
   class Adapter
     # Adapts the Haml::Parser from Haml 4 for use in HamlLint

data/lib/haml_lint/adapter/haml_6.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module HamlLint
+  class Adapter
+    # Adapts the Haml::Parser from Haml 5 for use in HamlLint
+    # :reek:UncommunicativeModuleName
+    class Haml6 < Adapter
+      # Parses the specified Haml code into an abstract syntax tree
+      #
+      # @example
+      #   HamlLint::Adapter::Haml6.new('%div')
+      #
+      # @api public
+      # @param source [String] Haml code to parse
+      # @param options [private Haml::Parser::ParserOptions]
+      def initialize(source, options = {})
+        @source = source
+        @parser = Haml::Parser.new(options)
+      end
+
+      # Parses the source code into an abstract syntax tree
+      #
+      # @example
+      #   HamlLint::Adapter::Haml6.new('%div').parse
+      #
+      # @api public
+      # @return [Haml::Parser::ParseNode]
+      # @raise [Haml::Error]
+      def parse
+        parser.call(source)
+      end
+
+      private
+
+      # The Haml parser to adapt for HamlLint
+      #
+      # @api private
+      # @return [Haml::Parser] the Haml 4 parser
+      attr_reader :parser
+
+      # The Haml code to parse
+      #
+      # @api private
+      # @return [String] Haml code to parse
+      attr_reader :source
+    end
+  end
+end

data/lib/haml_lint/adapter.rb

@@ -2,6 +2,7 @@
 
 require 'haml_lint/adapter/haml_4'
 require 'haml_lint/adapter/haml_5'
+require 'haml_lint/adapter/haml_6'
 require 'haml_lint/exceptions'
 
 module HamlLint
@@ -20,6 +21,7 @@ module HamlLint
       case version
       when '~> 4.0' then HamlLint::Adapter::Haml4
       when '~> 5.0', '~> 5.1', '~> 5.2' then HamlLint::Adapter::Haml5
+      when '~> 6.0', '~> 6.0.a' then HamlLint::Adapter::Haml6
       else fail HamlLint::Exceptions::UnknownHamlVersion, "Cannot handle Haml version: #{version}"
       end
     end

data/lib/haml_lint/linter/rubocop.rb

@@ -100,8 +100,9 @@ module HamlLint
     #
     # @return [Array<String>]
     def rubocop_flags
+      config_file = ENV['HAML_LINT_RUBOCOP_CONF'] || config['config_file']
       flags = %w[--format HamlLint::OffenseCollector]
-      flags += ['--config', ENV['HAML_LINT_RUBOCOP_CONF']] if ENV['HAML_LINT_RUBOCOP_CONF']
+      flags += ['--config', config_file] if config_file
       flags += ['--stdin']
       flags
     end

data/lib/haml_lint/ruby_extractor.rb

@@ -69,12 +69,12 @@ module HamlLint
       # variable" lints)
       additional_attributes.each do |attributes_code|
         # Normalize by removing excess whitespace to avoid format lints
-        attributes_code = attributes_code.gsub(/\s*\n\s*/, ' ').strip
+        attributes_code = attributes_code.gsub(/\s*\n\s*/, "\n").strip
 
         # Attributes can either be a method call or a literal hash, so wrap it
         # in a method call itself in order to avoid having to differentiate the
         # two.
-        add_line("{}.merge(#{attributes_code.strip})", node)
+        add_line("{}.merge(#{attributes_code})", node)
       end
 
       check_tag_static_hash_source(node)
@@ -94,6 +94,7 @@ module HamlLint
 
     def visit_script(node)
       code = node.text
+
       add_line(code.strip, node)
 
       start_block = anonymous_block?(code) || start_block_keyword?(code)

data/lib/haml_lint/tree/script_node.rb

@@ -9,7 +9,13 @@ module HamlLint::Tree
     #
     # @return [ParsedRuby] syntax tree in the form returned by Parser gem
     def parsed_script
-      HamlLint::ParsedRuby.new(HamlLint::RubyParser.new.parse(script))
+      statement =
+        if children.empty?
+          script
+        else
+          "#{script}#{@value[:keyword] == 'case' ? ';when 0;end' : ';end'}"
+        end
+      HamlLint::ParsedRuby.new(HamlLint::RubyParser.new.parse(statement))
     end
 
     # Returns the source for the script following the `-` marker.

data/lib/haml_lint/tree/silent_script_node.rb

@@ -8,7 +8,22 @@ module HamlLint::Tree
     #
     # @return [ParsedRuby] syntax tree in the form returned by Parser gem
     def parsed_script
-      HamlLint::ParsedRuby.new(HamlLint::RubyParser.new.parse(script))
+      statement =
+        case keyword = @value[:keyword]
+        when 'else', 'elsif'
+          'if 0;' + script + ';end'
+        when 'when'
+          'case;' + script + ';end'
+        when 'rescue', 'ensure'
+          'begin;' + script + ';end'
+        else
+          if children.empty?
+            script
+          else
+            "#{script}#{keyword == 'case' ? ';when 0;end' : ';end'}"
+          end
+        end
+      HamlLint::ParsedRuby.new(HamlLint::RubyParser.new.parse(statement))
     end
 
     # Returns the source for the script following the `-` marker.

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.40.0
+  version: 0.42.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - lib/haml_lint/adapter.rb
 - lib/haml_lint/adapter/haml_4.rb
 - lib/haml_lint/adapter/haml_5.rb
+- lib/haml_lint/adapter/haml_6.rb
 - lib/haml_lint/cli.rb
 - lib/haml_lint/comment_configuration.rb
 - lib/haml_lint/configuration.rb