rubocop 1.45.0 → 1.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b48bdf3e1c316571a4bd94150d56645a13044379b9932ebe8d21884b47b99113
-  data.tar.gz: 4bef483df24d39dd57877145a67ff68485b9b0d02b2e865a0cb9941c3ad7fc62
+  metadata.gz: 648a8aa3156aebf0c078bc0b600f301d3aa0abaf92d6b3643c343718575f7302
+  data.tar.gz: 21b185886d70b70a163c6e7f3ea47e04ee0a0afcf11217e0d7bcb31e25440880
 SHA512:
-  metadata.gz: 1628b1533fe7595ede88b51fbd581a04278d549cf21065e9d78534ee47cdffa23fda8709f48711b476879ab36b06d3ffec449a1f391378faaf676b5fe0ef4e7f
-  data.tar.gz: fcdba51766cf768940c9ebb770b8b8a40ed44384c00ba0ef8c8a903c0848816320fe53d0791da133ba607f8ab79fc36a68eaf833fdfdb5b0d179ff0ee9a0afc5
+  metadata.gz: ff5a5e947001ba9507f3e806896559baaf0e4bccc6b2cc56316dffc3ae334f62046040be389518139d2979c4d09900600f9b233bc1f4dbd2d1d37a2f8fe99037
+  data.tar.gz: 8f89f55198c9d206c5b8d0c32cbeb5033491046c0ea0f4311f6c1a23595bcce852ec732606ca1fd2bc499b31ecb2265dcf6d85edd352f6400d01bd9385993a44

data/lib/rubocop/cop/cop.rb

@@ -53,6 +53,11 @@ module RuboCop
       def add_offense(node_or_range, location: :expression, message: nil, severity: nil, &block)
         @v0_argument = node_or_range
         range = find_location(node_or_range, location)
+
+        # Since this range may be generated from Ruby code embedded in some
+        # template file, we convert it to location info in the original file.
+        range = range_for_original(range)
+
         if block.nil? && !support_autocorrect?
           super(range, message: message, severity: severity)
         else
@@ -93,14 +98,21 @@ module RuboCop
         super
       end
 
-      private
-
-      def begin_investigation(processed_source)
+      # Called before any investigation
+      # @api private
+      def begin_investigation(processed_source, offset: 0, original: processed_source)
         super
         @offenses = current_offenses
         @last_corrector = @current_corrector
+
+        # We need to keep track of the original source and offset,
+        # because `processed_source` here may be an embedded code in it.
+        @current_offset = offset
+        @current_original = original
       end
 
+      private
+
       # Override Base
       def callback_argument(_range)
         @v0_argument
@@ -141,6 +153,14 @@ module RuboCop
       rescue ::Parser::ClobberingError
         # ignore Clobbering errors
       end
+
+      def range_for_original(range)
+        ::Parser::Source::Range.new(
+          @current_original.buffer,
+          range.begin_pos + @current_offset,
+          range.end_pos + @current_offset
+        )
+      end
     end
   end
 end

data/lib/rubocop/cop/lint/debugger.rb

@@ -82,44 +82,25 @@ module RuboCop
         def debugger_methods
           @debugger_methods ||= begin
             config = cop_config.fetch('DebuggerMethods', [])
-            values = config.is_a?(Array) ? config : config.values.flatten
-            values.map do |v|
-              next unless v
-
-              *receiver, method_name = v.split('.')
-              {
-                receiver: receiver.empty? ? nil : receiver.map(&:to_sym),
-                method_name: method_name.to_sym
-              }
-            end.compact
+            config.is_a?(Array) ? config : config.values.flatten
           end
         end
 
         def debugger_method?(send_node)
-          method_name = send_node.method_name
-
-          debugger_methods.any? do |method|
-            next unless method[:method_name] == method_name
+          return if send_node.parent&.send_type? && send_node.parent.receiver == send_node
 
-            if method[:receiver].nil?
-              send_node.receiver.nil?
-            else
-              method[:receiver] == receiver_chain(send_node)
-            end
-          end
+          debugger_methods.include?(chained_method_name(send_node))
         end
 
-        def receiver_chain(send_node)
-          receivers = []
+        def chained_method_name(send_node)
+          chained_method_name = send_node.method_name.to_s
           receiver = send_node.receiver
-
           while receiver
-            name = receiver.send_type? ? receiver.method_name : receiver.const_name&.to_sym
-            receivers.unshift(name)
+            name = receiver.send_type? ? receiver.method_name : receiver.const_name
+            chained_method_name = "#{name}.#{chained_method_name}"
             receiver = receiver.receiver
           end
-
-          receivers
+          chained_method_name
         end
       end
     end

data/lib/rubocop/cop/style/access_modifier_declarations.rb

@@ -152,7 +152,7 @@ module RuboCop
 
         def right_siblings_same_inline_method?(node)
           node.right_siblings.any? do |sibling|
-            sibling.method?(node.method_name) && !sibling.arguments.empty?
+            sibling.send_type? && sibling.method?(node.method_name) && !sibling.arguments.empty?
           end
         end
 

data/lib/rubocop/cop/style/redundant_condition.rb

@@ -167,8 +167,8 @@ module RuboCop
         def argument_with_operator?(argument)
           return true if ARGUMENT_WITH_OPERATOR_TYPES.include?(argument.type)
           return false unless argument.hash_type?
+          return false unless (node = argument.children.first)
 
-          node = argument.children.first
           node.kwsplat_type? || node.forwarded_kwrestarg_type?
         end
 

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '1.45.0'
+    STRING = '1.45.1'
 
     MSG = '%<version>s (using Parser %<parser_version>s, ' \
           'rubocop-ast %<rubocop_ast_version>s, ' \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 1.45.0
+  version: 1.45.1
 platform: ruby
 authors:
 - Bozhidar Batsov