Router: increase NL penalty within interpolation

scalameta · Jun 19, 2024 · db27def · db27def
1 parent 1fbac8f
commit db27def
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
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
@@ -31,7 +31,7 @@ object Constants {
   val BracketPenalty = 20
   val ExceedColumnPenalty = 1000
   // Breaking a line like s"aaaaaaa${111111 + 22222}" should be last resort.
-  val BreakSingleLineInterpolatedString = 10 * ExceedColumnPenalty
+  val BreakSingleLineInterpolatedString = 1000 * ExceedColumnPenalty
 }
 
 /** Assigns splits to format tokens.

diff --git a/scalafmt-tests/src/test/resources/default/String.stat b/scalafmt-tests/src/test/resources/default/String.stat
@@ -664,8 +664,7 @@ object a {
 >>>
 object a {
   throw new Exception(
-    s"Can't create a new SpecialThingamer when forwarding without specialUserId/specialDetails. SpecialUserID: ${x
-        .maybeSpecialUserId}, Special details count: ${maybeSpecialDetails.map(_.length).getOrElse(0)}"
+    s"Can't create a new SpecialThingamer when forwarding without specialUserId/specialDetails. SpecialUserID: ${x.maybeSpecialUserId}, Special details count: ${maybeSpecialDetails.map(_.length).getOrElse(0)}"
   )
 }
 <<< #4067 avoid fold
@@ -684,8 +683,7 @@ object a {
 >>>
 object a {
   throw new Exception(
-    s"Can't create a new SpecialThingamer when forwarding without specialUserId/specialDetails. SpecialUserID: ${x
-        .maybeSpecialUserId}, Special details count: ${maybeSpecialDetails.map(_.length).getOrElse(0)}"
+    s"Can't create a new SpecialThingamer when forwarding without specialUserId/specialDetails. SpecialUserID: ${x.maybeSpecialUserId}, Special details count: ${maybeSpecialDetails.map(_.length).getOrElse(0)}"
   )
 }
 <<< #4067 avoid unfold
@@ -704,7 +702,6 @@ object a {
 >>>
 object a {
   throw new Exception(
-    s"Can't create a new SpecialThingamer when forwarding without specialUserId/specialDetails. SpecialUserID: ${x
-        .maybeSpecialUserId}, Special details count: ${maybeSpecialDetails.map(_.length).getOrElse(0)}"
+    s"Can't create a new SpecialThingamer when forwarding without specialUserId/specialDetails. SpecialUserID: ${x.maybeSpecialUserId}, Special details count: ${maybeSpecialDetails.map(_.length).getOrElse(0)}"
   )
 }