FormatOps: use milder expire token for if-else

Author: kitbellew

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala

@@ -168,6 +168,25 @@ class FormatOps(
       }
     }.fold(_.right, identity)
 
+  final def expireWithOptionalDelim(
+      expire: FormatToken
+  )(implicit style: ScalafmtConfig): FormatToken = {
+    def wouldDangle: Boolean = expire.meta.rightOwner match {
+      case p: Member.ParamClause =>
+        !shouldNotDangleAtDefnSite(p.parent, false)
+      case _: Member.Tuple =>
+        style.danglingParentheses.tupleOrCallSite(true)
+      case _: Member.ArgClause =>
+        style.danglingParentheses.tupleOrCallSite(false)
+      case _ => false
+    }
+    expire.right match {
+      case _: T.Comma => next(expire)
+      case RightParenOrBracket() if !wouldDangle => next(expire)
+      case _ => expire
+    }
+  }
+
   @tailrec
   final def endOfSingleLineBlock(
       start: FormatToken

scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala

@@ -2015,7 +2015,7 @@ class Router(formatOps: FormatOps) {
       case FormatToken(_: T.KwIf, right, _) if leftOwner.is[Term.If] =>
         val owner = leftOwner.asInstanceOf[Term.If]
         val expireTree = if (ifWithoutElse(owner)) owner else owner.elsep
-        val expire = rhsOptimalToken(tokens.getLast(expireTree))
+        val expire = expireWithOptionalDelim(tokens.getLast(expireTree)).left
         val mod =
           if (style.newlines.keepBreak(newlines)) Newline
           else Space(style.spaces.isSpaceAfterKeyword(right))
@@ -2089,7 +2089,7 @@ class Router(formatOps: FormatOps) {
           Split(Space, 0)
         )
       case FormatToken(_, T.KwElse() | T.KwYield(), _) =>
-        val expire = rhsOptimalToken(tokens.getLast(rightOwner))
+        val expire = expireWithOptionalDelim(tokens.getLast(rightOwner)).left
         val noSpace = shouldBreak(formatToken)
         def exclude = insideBracesBlock(formatToken, expire)
         val noSyntaxNL = formatToken.right.is[T.KwYield]
@@ -2722,28 +2722,10 @@ class Router(formatOps: FormatOps) {
   private def getSplitsValEqualsClassic(ft: FormatToken, body: Tree)(implicit
       style: ScalafmtConfig
   ): Seq[Split] = {
-    def wouldDangle = ft.meta.leftOwner.parent.exists {
-      case p: Member.ParamClause =>
-        !shouldNotDangleAtDefnSite(p.parent, false)
-      case _: Member.Tuple =>
-        style.danglingParentheses.tupleOrCallSite(true)
-      case p: Member.ArgClause =>
-        style.danglingParentheses.tupleOrCallSite(false) && (p.parent match {
-          case Some(_: Term.ApplyInfix) =>
-            style.newlines.formatInfix && p.values.lengthCompare(1) > 0
-          case _ => true
-        })
-      case _ => false
-    }
-
     val expireFt = tokens.getLast(body)
     val expire = expireFt.left
     // rhsOptimalToken is too aggressive here
-    val optimalFt = expireFt.right match {
-      case _: T.Comma => next(expireFt)
-      case RightParenOrBracket() if !wouldDangle => next(expireFt)
-      case _ => expireFt
-    }
+    val optimalFt = expireWithOptionalDelim(expireFt)
     val optimal = optimalFt.left
     def optimalWithComment =
       optimalFt.right match {

scalafmt-tests/src/test/resources/newlines/source_fold.stat

@@ -7034,8 +7034,7 @@ class a {
   )(in: Input[E]): Iteratee[E, Iteratee[E, A]] = in match {
     case Input.El(e) => Iteratee.flatten(
         Future(p(e))(pec).map(b =>
-          if (b) Done(inner, in)
-          else stepNoBreak(inner)(in)
+          if (b) Done(inner, in) else stepNoBreak(inner)(in)
         )(dec)
       )
     case _ => stepNoBreak(inner)(in)