Router: skip removed block when traversing

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

@@ -1625,8 +1625,9 @@ class FormatOps(
         case _: Term.TryClause => Split.ignored
         // don't tuck curried apply
         case t: Term.Apply if t.fun.is[Term.Apply] => slbSplit(expire)
-        case EndOfFirstCall(end) if !slbOnly => slbSplit(end)
-        case _ => slbSplit(expire)
+        case t =>
+          val endOpt = if (slbOnly) None else getEndOfFirstCall(t)
+          slbSplit(endOpt.getOrElse(expire))
       }
     }
 

scalafmt-core/shared/src/main/scala/org/scalafmt/util/TreeOps.scala

@@ -555,19 +555,20 @@ object TreeOps {
     case _ => Some(false)
   }.isDefined
 
-  object EndOfFirstCall {
-    def unapply(tree: Tree): Option[Token] = traverse(tree, None)
-      .map(_.tokens.last)
-
+  def getEndOfFirstCall(
+      tree: Tree,
+  )(implicit ftoks: FormatTokens): Option[Token] = {
     @tailrec
-    private def traverse(tree: Tree, res: Option[Tree]): Option[Tree] =
-      tree match {
-        case t: Term.Select if res.isDefined => traverse(t.qual, Some(t.qual))
-        case t: Term.ApplyType => traverse(t.fun, Some(t))
-        case t: Member.Apply => traverse(t.fun, Some(t.fun))
-        case t: Init => traverse(t.tpe, Some(t.tpe))
-        case _ => res
-      }
+    def traverse(tree: Tree, res: Option[Tree]): Option[Tree] = tree match {
+      case t: Term.Select if res.isDefined => traverse(t.qual, Some(t.qual))
+      case t: Term.ApplyType => traverse(t.fun, Some(t))
+      case t: Member.Apply => traverse(t.fun, Some(t.fun))
+      case t: Init => traverse(t.tpe, Some(t.tpe))
+      case Term.Block(arg :: Nil) if !ftoks.isEnclosedInBraces(tree) =>
+        traverse(arg, res)
+      case _ => res
+    }
+    traverse(tree, None).map(_.tokens.last)
   }
 
   @inline

scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat

@@ -11117,3 +11117,19 @@ runtime.unsafe
     } yield ()
   }
   .getOrThrowFiberFailure()
+<<< #4133 first call in removed braces
+maxColumn = 78
+newlines.avoidForSimpleOverflow = all
+rewrite.rules = [RedundantBraces]
+===
+val WatchHeartBeatInterval: FiniteDuration = {
+  WatchFailureDetectorConfig.getMillisDuration("heartbeat-interval")
+}.requiring(_ > Duration.Zero, "watch-failure-detector.heartbeat-interval must be > 0")
+>>>
+val WatchHeartBeatInterval: FiniteDuration =
+  WatchFailureDetectorConfig
+    .getMillisDuration("heartbeat-interval")
+    .requiring(
+      _ > Duration.Zero,
+      "watch-failure-detector.heartbeat-interval must be > 0"
+    )

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

@@ -10391,3 +10391,17 @@ runtime.unsafe.run {
 runtime.unsafe.run {
   for { _ <- ZIO.foreachDiscard(1.to(n))(_ => ZIO.yieldNow) } yield ()
 }.getOrThrowFiberFailure()
+<<< #4133 first call in removed braces
+maxColumn = 78
+newlines.avoidForSimpleOverflow = all
+rewrite.rules = [RedundantBraces]
+===
+val WatchHeartBeatInterval: FiniteDuration = {
+  WatchFailureDetectorConfig.getMillisDuration("heartbeat-interval")
+}.requiring(_ > Duration.Zero, "watch-failure-detector.heartbeat-interval must be > 0")
+>>>
+val WatchHeartBeatInterval: FiniteDuration = WatchFailureDetectorConfig
+  .getMillisDuration("heartbeat-interval").requiring(
+    _ > Duration.Zero,
+    "watch-failure-detector.heartbeat-interval must be > 0"
+  )

scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat

@@ -10868,3 +10868,18 @@ runtime.unsafe.run {
     _ <- ZIO.foreachDiscard(1.to(n))(_ => ZIO.yieldNow)
   } yield ()
 }.getOrThrowFiberFailure()
+<<< #4133 first call in removed braces
+maxColumn = 78
+newlines.avoidForSimpleOverflow = all
+rewrite.rules = [RedundantBraces]
+===
+val WatchHeartBeatInterval: FiniteDuration = {
+  WatchFailureDetectorConfig.getMillisDuration("heartbeat-interval")
+}.requiring(_ > Duration.Zero, "watch-failure-detector.heartbeat-interval must be > 0")
+>>>
+val WatchHeartBeatInterval: FiniteDuration =
+  WatchFailureDetectorConfig.getMillisDuration("heartbeat-interval")
+    .requiring(
+      _ > Duration.Zero,
+      "watch-failure-detector.heartbeat-interval must be > 0"
+    )

scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat

@@ -11272,3 +11272,18 @@ runtime
     } yield ()
   }
   .getOrThrowFiberFailure()
+<<< #4133 first call in removed braces
+maxColumn = 78
+newlines.avoidForSimpleOverflow = all
+rewrite.rules = [RedundantBraces]
+===
+val WatchHeartBeatInterval: FiniteDuration = {
+  WatchFailureDetectorConfig.getMillisDuration("heartbeat-interval")
+}.requiring(_ > Duration.Zero, "watch-failure-detector.heartbeat-interval must be > 0")
+>>>
+val WatchHeartBeatInterval: FiniteDuration = WatchFailureDetectorConfig
+  .getMillisDuration("heartbeat-interval")
+  .requiring(
+    _ > Duration.Zero,
+    "watch-failure-detector.heartbeat-interval must be > 0"
+  )

scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala

@@ -137,7 +137,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
     val explored = Debug.explored.get()
     logger.debug(s"Total explored: $explored")
     if (!onlyUnit && !onlyManual)
-      assertEquals(explored, 1115673, "total explored")
+      assertEquals(explored, 1115896, "total explored")
     val results = debugResults.result()
     // TODO(olafur) don't block printing out test results.
     // I don't want to deal with scalaz's Tasks :'(