Merge pull request #1190 from koic/fix_false_negatives_for_rails_pluck

[Fix #1189] Fix false negatives for `Rails/Pluck`

changelog/fix_false_negatives_for_rails_pluck.md

@@ -0,0 +1 @@
+* [#1189](https://github.com/rubocop/rubocop-rails/issues/1189): Fix false negatives for `Rails/Pluck` when using safe navigation method calls. ([@koic][])

lib/rubocop/cop/rails/pluck.rb

@@ -38,7 +38,7 @@ class Pluck < Base
         minimum_target_rails_version 5.0
 
         def_node_matcher :pluck_candidate?, <<~PATTERN
-          ({block numblock} (send _ {:map :collect}) $_argument (send lvar :[] $_key))
+          ({block numblock} (call _ {:map :collect}) $_argument (send lvar :[] $_key))
         PATTERN
 
         def on_block(node)

spec/rubocop/cop/rails/pluck_spec.rb

@@ -16,6 +16,19 @@
         end
       end
 
+      context "when safe navigation `#{method}` with symbol literal key can be replaced with `pluck`" do
+        it 'registers an offense' do
+          expect_offense(<<~RUBY, method: method)
+            x&.%{method} { |a| a[:foo] }
+               ^{method}^^^^^^^^^^^^^^^^ Prefer `pluck(:foo)` over `%{method} { |a| a[:foo] }`.
+          RUBY
+
+          expect_correction(<<~RUBY)
+            x&.pluck(:foo)
+          RUBY
+        end
+      end
+
       context "when `#{method}` with string literal key can be replaced with `pluck`" do
         it 'registers an offense' do
           expect_offense(<<~RUBY, method: method)