Merge pull request #391 from fatkodima/improve-map_compact-for-safe-h…

…andling Improve `Performance/MapCompact` to handle more safe navigation calls
rubocop · Nov 26, 2023 · eb714d9 · eb714d9
2 parents 6ba69de + 6dbda67
commit eb714d9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/changelog/change_improve_performance_map_compact_to.md b/changelog/change_improve_performance_map_compact_to.md
@@ -0,0 +1 @@
+* [#389](https://github.com/rubocop/rubocop-performance/issues/389): Improve `Performance/MapCompact` to handle more safe navigation calls. ([@fatkodima][])
diff --git a/lib/rubocop/cop/performance/map_compact.rb b/lib/rubocop/cop/performance/map_compact.rb
@@ -39,11 +39,11 @@ class MapCompact < Base
 
         def_node_matcher :map_compact, <<~PATTERN
           {
-            (send
+            (call
               $(call _ {:map :collect}
                 (block_pass
                   (sym _))) _)
-            (send
+            (call
               (block
                 $(call _ {:map :collect})
                   (args ...) _) _)

diff --git a/spec/rubocop/cop/performance/map_compact_spec.rb b/spec/rubocop/cop/performance/map_compact_spec.rb
@@ -13,7 +13,7 @@
       RUBY
     end
 
-    it 'registers an offense when using `collection.map(&:do_something)&.compact`' do
+    it 'registers an offense when using `collection&.map(&:do_something).compact`' do
       expect_offense(<<~RUBY)
         collection&.map(&:do_something).compact
                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `filter_map` instead.
@@ -24,6 +24,17 @@
       RUBY
     end
 
+    it 'registers an offense when using `collection&.map(&:do_something)&.compact`' do
+      expect_offense(<<~RUBY)
+        collection&.map(&:do_something)&.compact
+                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `filter_map` instead.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        collection&.filter_map(&:do_something)
+      RUBY
+    end
+
     it 'registers an offense when using `collection.map { |item| item.do_something }.compact`' do
       expect_offense(<<~RUBY)
         collection.map { |item| item.do_something }.compact
@@ -46,6 +57,17 @@
       RUBY
     end
 
+    it 'registers an offense when using `collection&.map { |item| item.do_something }&.compact`' do
+      expect_offense(<<~RUBY)
+        collection&.map { |item| item.do_something }&.compact
+                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `filter_map` instead.
+      RUBY
+
+      expect_correction(<<~RUBY)
+        collection&.filter_map { |item| item.do_something }
+      RUBY
+    end
+
     it 'registers an offense when using `collection.collect(&:do_something).compact`' do
       expect_offense(<<~RUBY)
         collection.collect(&:do_something).compact