fix(fmt): prevent double-ind in complex ternary expr (#12317)

Author: 0xrusowsky

crates/fmt/src/state/sol.rs

@@ -1565,34 +1565,35 @@ impl<'ast> State<'_, 'ast> {
         self.s.cbox(self.ind);
         self.s.ibox(0);
 
-        let mut print_ternary_expr =
-            |span_lo, prefix: Option<&'static str>, expr: &'ast ast::Expr<'ast>| {
-                match prefix {
-                    Some(prefix) => {
-                        if self.peek_comment_before(span_lo).is_some() {
-                            self.space();
-                        }
-                        self.print_comments(span_lo, CommentConfig::skip_ws());
-                        self.end();
-                        if !self.is_bol_or_only_ind() {
-                            self.space();
-                        }
-                        self.s.ibox(0);
-                        self.word(prefix);
+        let print_sub_expr = |this: &mut Self, span_lo, prefix, expr: &'ast ast::Expr<'ast>| {
+            match prefix {
+                Some(prefix) => {
+                    if this.peek_comment_before(span_lo).is_some() {
+                        this.space();
                     }
-                    None => {
-                        self.print_comments(expr.span.lo(), CommentConfig::skip_ws());
+                    this.print_comments(span_lo, CommentConfig::skip_ws());
+                    this.end();
+                    if !this.is_bol_or_only_ind() {
+                        this.space();
                     }
-                };
-                self.print_expr(expr);
+                    this.s.ibox(0);
+                    this.word(prefix);
+                }
+                None => {
+                    this.print_comments(expr.span.lo(), CommentConfig::skip_ws());
+                }
             };
+            this.print_expr(expr);
+        };
 
         // conditional expression
-        print_ternary_expr(then.span.lo(), None, cond);
+        self.s.ibox(-self.ind);
+        print_sub_expr(self, then.span.lo(), None, cond);
+        self.end();
         // then expression
-        print_ternary_expr(then.span.lo(), Some("? "), then);
+        print_sub_expr(self, then.span.lo(), Some("? "), then);
         // else expression
-        print_ternary_expr(els.span.lo(), Some(": "), els);
+        print_sub_expr(self, els.span.lo(), Some(": "), els);
 
         self.end();
         self.neverbreak();

crates/fmt/testdata/IfStatement2/120.fmt.sol

@@ -17,4 +17,12 @@ contract IfStatement {
                 : Math.mulDiv(vaultUsdValue[i], 1e18, totalDepositedTvl, Math.Rounding.Floor);
         }
     }
+
+    // https://github.com/foundry-rs/foundry/issues/12315
+    function repro_longComplexExpr() {
+        vars.expectedSnapshotTime = withdrawAmount
+            <= getDescaledAmount(flow.getSnapshotDebtScaled(streamId), flow.getTokenDecimals(streamId))
+            ? flow.getSnapshotTime(streamId)
+            : getBlockTimestamp();
+    }
 }

crates/fmt/testdata/IfStatement2/fmt.sol

@@ -26,4 +26,15 @@ contract IfStatement {
                 );
         }
     }
+
+    // https://github.com/foundry-rs/foundry/issues/12315
+    function repro_longComplexExpr() {
+        vars.expectedSnapshotTime = withdrawAmount
+            <= getDescaledAmount(
+                flow.getSnapshotDebtScaled(streamId),
+                flow.getTokenDecimals(streamId)
+            )
+            ? flow.getSnapshotTime(streamId)
+            : getBlockTimestamp();
+    }
 }

crates/fmt/testdata/IfStatement2/original.sol

@@ -18,4 +18,12 @@ contract IfStatement {
                 : Math.mulDiv(vaultUsdValue[i], 1e18, totalDepositedTvl, Math.Rounding.Floor);
         }
     }
+
+    // https://github.com/foundry-rs/foundry/issues/12315
+    function repro_longComplexExpr() {
+        vars. expectedSnapshotTime = withdrawAmount
+            <= getDescaledAmount(flow.getSnapshotDebtScaled (streamId), flow.getTokenDecimals(streamId))
+            ? flow.getSnapshotTime(streamId)
+            : getBlockTimestamp ();
+    }
 }