Merge pull request #445 from a-lavis/block_given_with_explicit_block_incompatible_with_block_forwarding

[Fix #444] Fix an incorrect autocorrect for `Performance/BlockGivenWi…

Author: koic

changelog/fix_an_incorrect_autocorrect_for_performance_block_given_with_explicit_block.md

@@ -0,0 +1 @@
+* [#444](https://github.com/rubocop/rubocop-performance/issues/444): Fix an incorrect autocorrect for `Performance/BlockGivenWithExplicitBlock` when using `Naming/BlockForwarding`'s autocorrection together. ([@a-lavis][])

lib/rubocop-performance.rb

@@ -7,10 +7,16 @@
 require_relative 'rubocop/performance/plugin'
 require_relative 'rubocop/cop/performance_cops'
 
-RuboCop::Cop::Lint::UnusedMethodArgument.singleton_class.prepend(
-  Module.new do
-    def autocorrect_incompatible_with
-      super.push(RuboCop::Cop::Performance::BlockGivenWithExplicitBlock)
-    end
+autocorrect_incompatible_with_block_given_with_explicit_block = Module.new do
+  def autocorrect_incompatible_with
+    super.push(RuboCop::Cop::Performance::BlockGivenWithExplicitBlock)
   end
+end
+
+RuboCop::Cop::Lint::UnusedMethodArgument.singleton_class.prepend(
+  autocorrect_incompatible_with_block_given_with_explicit_block
+)
+
+RuboCop::Cop::Naming::BlockForwarding.singleton_class.prepend(
+  autocorrect_incompatible_with_block_given_with_explicit_block
 )

lib/rubocop/cop/performance/block_given_with_explicit_block.rb

@@ -52,7 +52,7 @@ def on_send(node)
         end
 
         def self.autocorrect_incompatible_with
-          [Lint::UnusedMethodArgument]
+          [Lint::UnusedMethodArgument, Naming::BlockForwarding]
         end
       end
     end

spec/rubocop/cli/autocorrect_spec.rb

@@ -53,6 +53,25 @@ def foo()
     RUBY
   end
 
+  it 'corrects `Performance/BlockGivenWithExplicitBlock` with `Naming/BlockForwarding`' do
+    source = <<~RUBY
+      def foo(&block)
+        block_given?
+        bar(&block)
+      end
+    RUBY
+    create_file('example.rb', source)
+    expect(
+      cli.run(['--autocorrect', '--only', 'Performance/BlockGivenWithExplicitBlock,Naming/BlockForwarding'])
+    ).to eq(0)
+    expect(File.read('example.rb')).to eq(<<~RUBY)
+      def foo(&block)
+        block
+        bar(&block)
+      end
+    RUBY
+  end
+
   private
 
   def create_file(file_path, content)