Merge pull request #11915 from lucthev/redundant_safe_navigation_fals…

…e_positive Fix `Lint/RedundantSafeNavigation` when using `to_s`
rubocop · Jun 2, 2023 · 1181d4e · 1181d4e
2 parents e216c9b + d357b33
commit 1181d4e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/changelog/fix_switch_back_the_docs_version.md b/changelog/fix_switch_back_the_docs_version.md
@@ -0,0 +1 @@
+* [#11915](https://github.com/rubocop/rubocop/pull/11915): Fix a false positive for `Lint/RedundantSafeNavigation` when `&.` is used for `to_s`, `to_i`, `to_d`, and other coercion methods. ([@lucthev][])
diff --git a/lib/rubocop/cop/lint/redundant_safe_navigation.rb b/lib/rubocop/cop/lint/redundant_safe_navigation.rb
@@ -49,7 +49,7 @@ module Lint
       #   do_something if attrs&.not_nil_safe_method(:[])
       #
       class RedundantSafeNavigation < Base
-        include NilMethods
+        include AllowedMethods
         include RangeHelp
         extend AutoCorrector
 
@@ -63,7 +63,7 @@ class RedundantSafeNavigation < Base
         PATTERN
 
         def on_csend(node)
-          return unless check?(node) && nil_methods.include?(node.method_name)
+          return unless check?(node) && allowed_method?(node.method_name)
           return if respond_to_nil_specific_method?(node)
 
           range = range_between(node.loc.dot.begin_pos, node.source_range.end_pos)

diff --git a/spec/rubocop/cop/lint/redundant_safe_navigation_spec.rb b/spec/rubocop/cop/lint/redundant_safe_navigation_spec.rb
@@ -72,21 +72,6 @@
     RUBY
   end
 
-  it 'registers an offense and corrects when `&.` is used for `to_d`' do
-    expect_offense(<<~RUBY)
-      if foo&.to_d
-            ^^^^^^ Redundant safe navigation detected.
-        do_something_else
-      end
-    RUBY
-
-    expect_correction(<<~RUBY)
-      if foo.to_d
-        do_something_else
-      end
-    RUBY
-  end
-
   it 'does not register an offense when using `&.` outside of conditions' do
     expect_no_offenses(<<~RUBY)
       foo&.respond_to?(:bar)
@@ -108,4 +93,12 @@
       do_something if foo&.respond_to?(:to_a)
     RUBY
   end
+
+  it 'does not register an offense when `&.` is used with coercion methods' do
+    expect_no_offenses(<<~RUBY)
+      foo&.to_s || 'Default string'
+      foo&.to_i || 1
+      do_something if foo&.to_d
+    RUBY
+  end
 end