Merge pull request #9371 from koic/fix_an_incorrect_autocorrect_for_s…

…tyle_sole_nested_conditional

[Fix #9370] Fix an incorrect auto-correct for `Style/SoleNestedCondtional`

changelog/fix_an_incorrect_autocorrect_for_style_sole_nested_conditional.md

@@ -0,0 +1 @@
+* [#9370](https://github.com/rubocop-hq/rubocop/issues/9370): Fix an incorrect auto-correct for `Style/SoleNestedConditional` when using nested `unless` modifier multiple conditional. ([@koic][])

lib/rubocop/cop/style/sole_nested_conditional.rb

@@ -131,7 +131,7 @@ def arguments_range(node)
         end
 
         def wrap_condition?(node)
-          node.or_type? ||
+          node.and_type? || node.or_type? ||
             (node.send_type? && node.arguments.any? && !node.parenthesized?)
         end
 

spec/rubocop/cop/style/sole_nested_conditional_spec.rb

@@ -113,6 +113,21 @@
     RUBY
   end
 
+  it 'registers an offense and corrects when using nested `unless` modifier multiple conditional' do
+    expect_offense(<<~RUBY)
+      if foo
+        do_something unless bar && baz
+                     ^^^^^^ Consider merging nested conditions into outer `if` conditions.
+      end
+    RUBY
+
+    expect_correction(<<~RUBY)
+      if foo && !(bar && baz)
+        do_something
+      end
+    RUBY
+  end
+
   it 'registers an offense and corrects when nested `||` operator condition' do
     expect_offense(<<~RUBY)
       if foo