haml_lint 0.51.0 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71dc6acf56f28f4f6878ff300a653d1fb6c5cc6fa9da23c71813463ea9e1b67a
-  data.tar.gz: af2fa134ec9718c24d019e20c359c9a965d6d09490e6f57fe202654f5f7f95a3
+  metadata.gz: 49bb0bec15e96c047439560e80f83eaf6f4c3baec24a12b1f10248f1d2f347d3
+  data.tar.gz: 153f65eda76c5751bbae1d02fc49d0d4477f401bb273096ad9308868b9d21288
 SHA512:
-  metadata.gz: 73c8a4c7fbd68cfbeacd29e5d313dcf9ae120a624a0359fecf5ca25396a8e68a0cfbad68b0ac9854af82a9233ffb26a9adf7db156f8dd3b5eb8b7a83773db035
-  data.tar.gz: fcb59570ff3b999f81f12208993ab75118013b0262586478145d7d0eaa9bab78002d9808757e10025324082f895bb0962743133898dd31dbb6c3db73d4c7f68c
+  metadata.gz: a4d2c2682e7b12d9aaf8164054f3533c0667f5f6035bfbf5ef6bbb694a40f9a70d9d13a9aa56dabf27131be27e74d346c9eff642a65d0e2aac8992ebc1999fba
+  data.tar.gz: 343aee9ed9bf4a766640aabbbaf96af9a5c36261fb6e6943b9a0b9eadcb5c75bc5a15665cae30c3c4c8925b307ecca837130fb04cf1d14a74549978db235f60c

data/bin/haml-lint

@@ -4,5 +4,4 @@
 require 'haml_lint'
 require 'haml_lint/cli'
 
-logger = HamlLint::Logger.new($stdout)
-exit HamlLint::CLI.new(logger).run(ARGV)
+exit HamlLint::CLI.new.run(ARGV)

data/lib/haml_lint/adapter/haml_5.rb

@@ -46,7 +46,7 @@ module HamlLint
       # The Haml parser to adapt for HamlLint
       #
       # @api private
-      # @return [Haml::Parser] the Haml 4 parser
+      # @return [Haml::Parser] the Haml 5 parser
       attr_reader :parser
 
       # The Haml code to parse

data/lib/haml_lint/adapter/haml_6.rb

@@ -2,7 +2,7 @@
 
 module HamlLint
   class Adapter
-    # Adapts the Haml::Parser from Haml 5 for use in HamlLint
+    # Adapts the Haml::Parser from Haml 6 for use in HamlLint
     # :reek:UncommunicativeModuleName
     class Haml6 < Adapter
       # Parses the specified Haml code into an abstract syntax tree
@@ -46,7 +46,7 @@ module HamlLint
       # The Haml parser to adapt for HamlLint
       #
       # @api private
-      # @return [Haml::Parser] the Haml 4 parser
+      # @return [Haml::Parser] the Haml 6 parser
       attr_reader :parser
 
       # The Haml code to parse

data/lib/haml_lint/adapter.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'haml_lint/adapter/haml_4'
 require 'haml_lint/adapter/haml_5'
 require 'haml_lint/adapter/haml_6'
 require 'haml_lint/exceptions'
@@ -19,9 +18,8 @@ module HamlLint
     def self.detect_class
       version = haml_version
       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', '~> 6.1', '~> 6.2' then HamlLint::Adapter::Haml6
+      when '~> 6.0', '~> 6.0.a', '~> 6.1', '~> 6.2', '~> 6.3' then HamlLint::Adapter::Haml6
       else fail HamlLint::Exceptions::UnknownHamlVersion, "Cannot handle Haml version: #{version}"
       end
     end

data/lib/haml_lint/cli.rb

@@ -10,8 +10,8 @@ module HamlLint
   class CLI
     # Create a CLI that outputs to the specified logger.
     #
-    # @param logger [HamlLint::Logger]
-    def initialize(logger)
+    # @param logger [HamlLint::Logger, nil]
+    def initialize(logger = nil)
       @log = logger
     end
 
@@ -63,6 +63,7 @@ module HamlLint
     #
     # @return [void]
     def configure_logger(options)
+      @log ||= HamlLint::Logger.new(options[:stderr] ? $stderr : $stdout)
       log.color_enabled = options.fetch(:color, log.tty?)
       log.summary_enabled = options.fetch(:summary, true)
     end

data/lib/haml_lint/options.rb

@@ -69,6 +69,10 @@ module HamlLint
         @options[:autocorrect_only] = true
         @options[:autocorrect] ||= :safe
       end
+
+      parser.on('--stderr', 'Write all output to stderr') do
+        @options[:stderr] = true
+      end
     end
 
     def add_report_options(parser)

data/lib/haml_lint/rake_task.rb

@@ -104,7 +104,7 @@ module HamlLint
     # @param task_args [Rake::TaskArguments]
     def run_cli(task_args)
       cli_args = parse_args
-      logger = quiet ? HamlLint::Logger.silent : HamlLint::Logger.new($stdout)
+      logger = quiet ? HamlLint::Logger.silent : nil
       result = HamlLint::CLI.new(logger).run(Array(cli_args) + files_to_lint(task_args))
 
       fail "#{HamlLint::APP_NAME} failed with exit code #{result}" unless result == 0

data/lib/haml_lint/ruby_extraction/chunk_extractor.rb

@@ -84,7 +84,35 @@ module HamlLint::RubyExtraction
     def visit_comment(node)
       line = @original_haml_lines[node.line - 1]
       indent = line.index(/\S/)
+
       @ruby_chunks << PlaceholderMarkerChunk.new(node, 'comment', indent: indent)
+
+      # Comment can have subnodes, such as plain. This happens for conditional comments, such as:
+      # %head
+      #   /[if mso]
+      #     %div
+      if node.children
+        # 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
+        begin_chunk = AdHocChunk.new(node, [' ' * indent + 'begin'])
+        @ruby_chunks << begin_chunk
+        indent += 2
+
+        yield
+
+        indent -= 2
+
+        if @ruby_chunks.last.equal?(begin_chunk)
+          # So there is nothing nesting, remove the wrapping "begin"
+          @ruby_chunks.pop
+        else
+          @ruby_chunks << AdHocChunk.new(node,
+                                         [' ' * indent + 'ensure', ' ' * indent + '  HL.noop', ' ' * indent + 'end'],
+                                         haml_line_index: @ruby_chunks.last.haml_end_line_index)
+        end
+      end
     end
 
     # Visit a script which outputs. Lines looking like `  = foo`

data/lib/haml_lint/tree/root_node.rb

@@ -16,10 +16,26 @@ module HamlLint::Tree
     #
     # @param line [Integer] the line number of the node
     # @return [HamlLint::Node]
-    def node_for_line(line)
-      find(-> { HamlLint::Tree::NullNode.new }) do |node|
-        node.line_numbers.cover?(line) && node != self
+    def node_for_line(line) # rubocop:disable Metrics
+      each do |node|
+        return node if node.line_numbers.cover?(line) && node != self
       end
+
+      # Because HAML doesn't leave any trace in the nodes when it merges lines that
+      # end with a comma, it's harder to assign a node to the second line here:
+      # = some_call user,
+      #             foo, bar
+      # So if the simple strategy (above) doesn't work, we try to see if we check if the last node
+      # that was before the requested line was one that could have been merged. If so, we use that one.
+      best_guess = nil
+      each do |node|
+        best_guess = node if node != self && node.line_numbers.end < line
+      end
+
+      # There are the cases were the merging without traces can happen
+      return best_guess if best_guess && %i[script silent_script tag].include?(best_guess.type)
+
+      HamlLint::Tree::NullNode.new
     end
   end
 end

data/lib/haml_lint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haml_lint
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.53.0
 platform: ruby
 authors:
 - Shane da Silva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +93,6 @@ files:
 - config/forced_rubocop_config.yml
 - lib/haml_lint.rb
 - 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
@@ -200,7 +199,7 @@ homepage: https://github.com/sds/haml-lint
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -215,8 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: HAML lint tool
 test_files: []

data/lib/haml_lint/adapter/haml_4.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'forwardable'
-
-module HamlLint
-  class Adapter
-    # Adapts the Haml::Parser from Haml 4 for use in HamlLint
-    # :reek:UncommunicativeModuleName
-    class Haml4 < Adapter
-      extend Forwardable
-
-      # Parses the specified Haml code into an abstract syntax tree
-      #
-      # @example
-      #   HamlLint::Adapter::Haml4.new('%div')
-      #
-      # @api public
-      # @param source [String] Haml code to parse
-      # @param options [Haml::Options]
-      def initialize(source, options = Haml::Options.new)
-        @source = source
-        @parser = Haml::Parser.new(source, options)
-      end
-
-      def precompile
-        # Haml uses the filters as part of precompilation... we don't care about those,
-        # but without this tweak, it would fail on filters that are not loaded.
-        real_defined = Haml::Filters.defined
-        Haml::Filters.instance_variable_set(:@defined, Hash.new { real_defined['plain'] })
-
-        ::Haml::Engine.new(source).precompiled
-      ensure
-        Haml::Filters.instance_variable_set(:@defined, real_defined)
-      end
-
-      # @!method
-      #   Parses the source code into an abstract syntax tree
-      #
-      #   @example
-      #     HamlLint::Adapter::Haml4.new('%div')
-      #
-      #   @api public
-      #   @return [Haml::Parser::ParseNode]
-      # @raise [Haml::Error]
-      def_delegator :parser, :parse
-
-      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