Merge pull request #8807 from koic/fix_incorrect_autocorrect_for_redu…

…ndant_condition

Fix a false positive for `Style/RedundantCondition`

CHANGELOG.md

@@ -15,6 +15,7 @@
 * [#8825](https://github.com/rubocop-hq/rubocop/issues/8825): Fix crash in `Style/ExplicitBlockArgument` when code is called outside of a method. ([@ghiculescu][])
 * [#8354](https://github.com/rubocop-hq/rubocop/issues/8354): Detect regexp named captures in `Style/CaseLikeIf` cop. ([@dsavochkin][])
 * [#8830](https://github.com/rubocop-hq/rubocop/issues/8830): Fix bad autocorrect of `Style/StringConcatenation` when string includes double quotes. ([@tleish][])
+* [#8807](https://github.com/rubocop-hq/rubocop/pull/8807): Fix a false positive for `Style/RedundantCondition` when using assignment by hash key access. ([@koic][])
 
 ### Changes
 

lib/rubocop/cop/style/redundant_condition.rb

@@ -75,7 +75,7 @@ def range_of_offense(node)
         def offense?(node)
           condition, if_branch, else_branch = *node
 
-          return false if use_if_branch?(else_branch)
+          return false if use_if_branch?(else_branch) || use_hash_key_assignment?(else_branch)
 
           condition == if_branch && !node.elsif? && (
             node.ternary? ||
@@ -88,6 +88,10 @@ def use_if_branch?(else_branch)
           else_branch&.if_type?
         end
 
+        def use_hash_key_assignment?(else_branch)
+          else_branch&.send_type? && else_branch&.method?(:[]=)
+        end
+
         def else_source(else_branch)
           if require_parentheses?(else_branch)
             "(#{else_branch.source})"

spec/rubocop/cop/style/redundant_condition_spec.rb

@@ -42,6 +42,16 @@
         RUBY
       end
 
+      it 'registers an offense and corrects when using assignment by hash key access' do
+        expect_no_offenses(<<~RUBY)
+          if @cache[key]
+            @cache[key]
+          else
+            @cache[key] = heavy_load[key]
+          end
+        RUBY
+      end
+
       it 'registers an offense and corrects when `raise` without argument parentheses in `else`' do
         expect_offense(<<~RUBY)
           if b