Merge pull request #13938 from koic/fix_false_positive_for_style_redundant_condition

koic · web-flow · commit 2873bb81d63b · 2025-03-04T01:45:50.000+09:00
Fix false positives for `Style/RedundantCondition`
diff --git a/changelog/fix_false_positive_for_style_redundant_condition.md b/changelog/fix_false_positive_for_style_redundant_condition.md
@@ -0,0 +1 @@
+* [#13938](https://github.com/rubocop/rubocop/pull/13938): Fix false positives for `Style/RedundantCondition` when a variable or a constant is used. ([@koic][])
diff --git a/lib/rubocop/cop/style/redundant_condition.rb b/lib/rubocop/cop/style/redundant_condition.rb
@@ -182,9 +182,8 @@ def if_branch_is_true_type_and_else_is_not?(node)
           return false unless node.ternary? || node.if?
 
           cond = node.condition
-          if cond.call_type? && (!cond.predicate_method? || allowed_method?(cond.method_name))
-            return false
-          end
+          return false unless cond.call_type?
+          return false if !cond.predicate_method? || allowed_method?(cond.method_name)
 
           node.if_branch&.true_type? && node.else_branch && !node.else_branch.true_type?
         end
diff --git a/spec/rubocop/cop/style/redundant_condition_spec.rb b/spec/rubocop/cop/style/redundant_condition_spec.rb
@@ -571,6 +571,58 @@ def do_something(foo, ...)
     end
 
     context 'when `true` as the true branch' do
+      it 'does not register an offense when true is used as the true branch and the condition is a local variable' do
+        expect_no_offenses(<<~RUBY)
+          variable = do_something
+
+          if variable
+            true
+          else
+            a
+          end
+        RUBY
+      end
+
+      it 'does not register an offense when true is used as the true branch and the condition is an instance variable' do
+        expect_no_offenses(<<~RUBY)
+          if @variable
+            true
+          else
+            a
+          end
+        RUBY
+      end
+
+      it 'does not register an offense when true is used as the true branch and the condition is a class variable' do
+        expect_no_offenses(<<~RUBY)
+          if @@variable
+            true
+          else
+            a
+          end
+        RUBY
+      end
+
+      it 'does not register an offense when true is used as the true branch and the condition is a global variable' do
+        expect_no_offenses(<<~RUBY)
+          if $variable
+            true
+          else
+            a
+          end
+        RUBY
+      end
+
+      it 'does not register an offense when true is used as the true branch and the condition is a constant' do
+        expect_no_offenses(<<~RUBY)
+          if CONST
+            true
+          else
+            a
+          end
+        RUBY
+      end
+
       it 'does not register an offense when true is used as the true branch and the condition is not a predicate method' do
         expect_no_offenses(<<~RUBY)
           if a[:key]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+* [#13938](https://github.com/rubocop/rubocop/pull/13938): Fix false positives for `Style/RedundantCondition` when a variable or a constant is used. ([@koic][])