[Fix rubocop#12301] Make Style/RedundantFilterChain aware of safe n…

…avigation Fixes rubocop#12301. This PR makes `Style/RedundantFilterChain` aware of safe navigation.
koic · Oct 21, 2023 · a17909d · a17909d
1 parent a797c98
commit a17909d
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/changelog/fix_make_style_redundant_filter_chain_aware_of_safe_navigation.md b/changelog/fix_make_style_redundant_filter_chain_aware_of_safe_navigation.md
@@ -0,0 +1 @@
+* [#12301](https://github.com/rubocop/rubocop/issues/12301): Make `Style/RedundantFilterChain` aware of safe navigation operator. ([@koic][])
diff --git a/lib/rubocop/cop/style/redundant_filter_chain.rb b/lib/rubocop/cop/style/redundant_filter_chain.rb
@@ -60,10 +60,10 @@ class RedundantFilterChain < Base
 
         # @!method select_predicate?(node)
         def_node_matcher :select_predicate?, <<~PATTERN
-          (send
+          (call
             {
-              (block $(send _ {:select :filter :find_all}) ...)
-              $(send _ {:select :filter :find_all} block_pass_type?)
+              (block $(call _ {:select :filter :find_all}) ...)
+              $(call _ {:select :filter :find_all} block_pass_type?)
             }
             ${:#{RESTRICT_ON_SEND.join(' :')}})
         PATTERN
@@ -87,6 +87,7 @@ def on_send(node)
             register_offense(select_node, node)
           end
         end
+        alias on_csend on_send
 
         private
 

diff --git a/spec/rubocop/cop/style/redundant_filter_chain_spec.rb b/spec/rubocop/cop/style/redundant_filter_chain_spec.rb
@@ -75,6 +75,52 @@
         arr.#{method}(&:odd?).any? { |x| x > 10 }
       RUBY
     end
+
+    context 'when using safe navigation operator' do
+      it "registers an offense when using `##{method}` followed by `#any?`" do
+        expect_offense(<<~RUBY, method: method)
+          arr&.%{method} { |x| x > 1 }&.any?
+               ^{method}^^^^^^^^^^^^^^^^^^^^ Use `any?` instead of `#{method}.any?`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          arr&.any? { |x| x > 1 }
+        RUBY
+      end
+
+      it "registers an offense when using `##{method}` followed by `#empty?`" do
+        expect_offense(<<~RUBY, method: method)
+          arr&.%{method} { |x| x > 1 }&.empty?
+               ^{method}^^^^^^^^^^^^^^^^^^^^^^ Use `none?` instead of `#{method}.empty?`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          arr&.none? { |x| x > 1 }
+        RUBY
+      end
+
+      it "registers an offense when using `##{method}` followed by `#none?`" do
+        expect_offense(<<~RUBY, method: method)
+          arr&.%{method} { |x| x > 1 }&.none?
+               ^{method}^^^^^^^^^^^^^^^^^^^^^ Use `none?` instead of `#{method}.none?`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          arr&.none? { |x| x > 1 }
+        RUBY
+      end
+
+      it "registers an offense when using `##{method}` with block-pass followed by `#none?`" do
+        expect_offense(<<~RUBY, method: method)
+          arr&.%{method}(&:odd?)&.none?
+               ^{method}^^^^^^^^^^^^^^^ Use `none?` instead of `#{method}.none?`.
+        RUBY
+
+        expect_correction(<<~RUBY)
+          arr&.none?(&:odd?)
+        RUBY
+      end
+    end
   end
 
   it 'does not register an offense when using `#any?`' do