Fix nested-when-to-compound-when triggering on single when with and (#743)

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: jackfirth <[email protected]>

Author: Copilot

default-recommendations/conditional-shortcuts-test.rkt

@@ -772,6 +772,15 @@ no-change-test: "when with multiple forms in outer body should not be merged"
 --------------------
 
 
+no-change-test: "single when with and containing 3 conditions should not be refactored"
+--------------------
+(define (f a b c)
+  (when (and (a) (b)
+             (c))
+    (displayln "foo")))
+--------------------
+
+
 test: "ignored and expression refactorable to when expression"
 --------------------
 (define (f c1)

default-recommendations/conditional-shortcuts.rkt

@@ -222,7 +222,8 @@
   "Nested `when` expressions can be merged into a single compound `when` expression."
   when-expr:nested-when-expression
   #:when (or (>= (attribute when-expr.depth) 3)
-             (>= (length (attribute when-expr.condition)) 3)
+             (and (>= (attribute when-expr.depth) 2)
+                  (>= (length (attribute when-expr.condition)) 3))
              (and (equal? (attribute when-expr.depth) 2)
                   (andmap identifier? (attribute when-expr.condition))))
   (when (and when-expr.condition ...) when-expr.body ...))