haml_lint 0.51.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71dc6acf56f28f4f6878ff300a653d1fb6c5cc6fa9da23c71813463ea9e1b67a
-  data.tar.gz: af2fa134ec9718c24d019e20c359c9a965d6d09490e6f57fe202654f5f7f95a3
+  metadata.gz: 24f37fc2b314359fb58b5209e58399fa01f53d51c977a4c60b66d9497e2acde5
+  data.tar.gz: afb033a6021882a269ec1fdf989d06c83c6df8047a3f60233ac83ac9f234469d
 SHA512:
-  metadata.gz: 73c8a4c7fbd68cfbeacd29e5d313dcf9ae120a624a0359fecf5ca25396a8e68a0cfbad68b0ac9854af82a9233ffb26a9adf7db156f8dd3b5eb8b7a83773db035
-  data.tar.gz: fcb59570ff3b999f81f12208993ab75118013b0262586478145d7d0eaa9bab78002d9808757e10025324082f895bb0962743133898dd31dbb6c3db73d4c7f68c
+  metadata.gz: abb4758509d1aca40826e598c8d1bdfb7daffbbbeb9d1955c18463e44c4799ce5102151ae34b58799198336d87ba2c4e922a699b8f9c28b13f94479d80f4607a
+  data.tar.gz: f585fb701da7d6ca46ab9612055a25be83c640c97da530fa19ca20684e27056955ca80714a666fef1568fb8fa4bceba5830005167b3f4a76dc575732876d125e

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

@@ -21,7 +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', '~> 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/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.52.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.52.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml