[Fix: rubocop#12109] Fix an error for Style/ArgumentsForwarding cop…

… when forwarding kwargs/block arg and an additional arg

Fix: rubocop#12109

changelog/fix_an_error_for_style_arguments_forwarding_cop_when_forwarding_kwargs_block.md

@@ -0,0 +1 @@
+* [#12109](https://github.com/rubocop/rubocop/issues/12109): Fix an error for `Style/ArgumentsForwarding` cop when forwarding kwargs/block arg and an additional arg. ([@ydah][])

lib/rubocop/cop/style/arguments_forwarding.rb

@@ -80,6 +80,7 @@ class ArgumentsForwarding < Base
         minimum_target_ruby_version 2.7
 
         FORWARDING_LVAR_TYPES = %i[splat kwsplat block_pass].freeze
+        ADDITIONAL_ARG_TYPES = %i[lvar arg].freeze
 
         FORWARDING_MSG = 'Use shorthand syntax `...` for arguments forwarding.'
         ARGS_MSG = 'Use anonymous positional arguments forwarding (`*`).'
@@ -212,7 +213,7 @@ def register_forward_all_offense(def_or_send, send_or_arguments, rest_or_splat)
         end
 
         def arguments_range(node, first_node)
-          arguments = node.arguments
+          arguments = node.arguments.reject { |arg| ADDITIONAL_ARG_TYPES.include?(arg.type) }
 
           start_node = first_node || arguments.first
 
@@ -332,9 +333,9 @@ def target_ruby_version
           end
 
           def no_post_splat_args?
-            splat_index = arguments.index(forwarded_rest_arg)
-            arg_after_splat = arguments[splat_index + 1]
+            return true unless (splat_index = arguments.index(forwarded_rest_arg))
 
+            arg_after_splat = arguments[splat_index + 1]
             [nil, :hash, :block_pass].include?(arg_after_splat&.type)
           end
 

spec/rubocop/cop/style/arguments_forwarding_spec.rb

@@ -519,6 +519,38 @@ def self.get(...)
         end
       RUBY
     end
+
+    it 'registers an offense when forwarding kwargs/block arg' do
+      expect_offense(<<~RUBY)
+        def foo(**kwargs, &block)
+                ^^^^^^^^^^^^^^^^ Use shorthand syntax `...` for arguments forwarding.
+          baz(**kwargs, &block)
+              ^^^^^^^^^^^^^^^^ Use shorthand syntax `...` for arguments forwarding.
+        end
+      RUBY
+
+      expect_correction(<<~RUBY)
+        def foo(...)
+          baz(...)
+        end
+      RUBY
+    end
+
+    it 'registers an offense when forwarding kwargs/block arg and an additional arg' do
+      expect_offense(<<~RUBY)
+        def foo(x, **kwargs, &block)
+                   ^^^^^^^^^^^^^^^^ Use shorthand syntax `...` for arguments forwarding.
+          baz(x, **kwargs, &block)
+                 ^^^^^^^^^^^^^^^^ Use shorthand syntax `...` for arguments forwarding.
+        end
+      RUBY
+
+      expect_correction(<<~RUBY)
+        def foo(x, ...)
+          baz(x, ...)
+        end
+      RUBY
+    end
   end
 
   context 'TargetRubyVersion >= 3.1', :ruby31 do