From 25a5c6c737ff01c487e090c217492e0222b8de4c Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:17:40 -0700 Subject: [PATCH] Router: fix consistency based on src NL existence --- .../shared/src/main/scala/org/scalafmt/internal/Router.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala index b530092768..bfc4124183 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala @@ -545,7 +545,9 @@ class Router(formatOps: FormatOps) { ) Seq(baseSplit) else if (nft.right.is[T.KwCase]) getNLOnlySplit else if (hasBreak() && !beforeMultiline.ignoreSourceSplit) - getNLOnlySplit + if ((beforeMultiline eq Newlines.keep) && !bodyIsEmpty) + getFolded(isKeep = true).filter(_.isNL) + else getNLOnlySplit else if (bodyIsEmpty) if (rt.isAny[T.RightBrace, T.Semicolon]) Seq(baseSplit, nlSplit(nft)(1))