Router: apply src=keep around : return-type

scalameta · Aug 6, 2024 · eca4e89 · eca4e89
1 parent 9290122
commit eca4e89
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 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
@@ -1323,7 +1323,8 @@ class Router(formatOps: FormatOps) {
             PenalizeAllNewlines(expire, Constants.BracketPenalty)
           val indent = style.indent.getDefnSite(leftOwner)
           Seq(
-            Split(sameLineSplit, 0).withPolicy(penalizeNewlines),
+            Split(style.newlines.keepBreak(hasBreak()), 0)(sameLineSplit)
+              .withPolicy(penalizeNewlines),
             // Spark style guide allows this:
             // https://github.com/databricks/scala-style-guide#indent
             Split(Newline, Constants.SparkColonNewline)

diff --git a/scalafmt-tests/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/src/test/resources/newlines/source_keep.stat
@@ -8347,17 +8347,10 @@ object a {
   val current: Map[String, Object] = template.templateFile.settings.getOrElse("page", Map.empty).asInstanceOf[Map[String, Object]]
 }
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
- object a {
--  val current: Map[String, Object] =
--    template.templateFile.settings.getOrElse(
--      "page",
--      Map.empty
--    ).asInstanceOf[Map[String, Object]]
-+  val current
-+      : Map[String, Object] = template.templateFile.settings.getOrElse(
-+    "page",
-+    Map.empty
-+  ).asInstanceOf[Map[String, Object]]
- }
+object a {
+  val current
+      : Map[String, Object] = template.templateFile.settings.getOrElse(
+    "page",
+    Map.empty
+  ).asInstanceOf[Map[String, Object]]
+}
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -3682,8 +3682,8 @@ object a {
   implicit def generate[T](
       value: T
   ): Clue[T] = macro MacroCompatScala2.clueImpl
-  implicit def generate[T](value: T): Clue[T] = macro
-    MacroCompatScala2.clueImpl
+  implicit def generate[T](value: T)
+      : Clue[T] = macro MacroCompatScala2.clueImpl
 }
 <<< #3204 if
 object a: