FormatOps: keep newline after comment in body

scalameta · Dec 9, 2021 · 89099e3 · 89099e3
1 parent 88ddbfd
commit 89099e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatOps.scala
@@ -1807,11 +1807,12 @@ class FormatOps(
  nlSplitFunc: Int => Split
  )(splitsFunc: FormatToken => Seq[Split]): Seq[Split] =
  if (!ft.right.is[T.Comment]) splitsFunc(ft)
- else if (ft.hasBreak || isSingleLineComment(ft.right))
- Seq(nlSplitFunc(0).forThisLine)
+ else if (ft.hasBreak) Seq(nlSplitFunc(0).forThisLine)
  else {
  val nextFt = nextNonCommentSameLine(next(ft))
- val splits = splitsFunc(nextFt)
+ val splits =
+ if (nextFt.noBreak) splitsFunc(nextFt)
+ else Seq(nlSplitFunc(0).forThisLine)
  val policy = Policy.on(nextFt.right) { case Decision(`nextFt`, _) =>
  splits
  }

diff --git a/scalafmt-tests/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/src/test/resources/newlines/source_fold.stat
@@ -2711,7 +2711,8 @@ object a {
 >>>
 object a {
  def validate(d: DirectoryProxy, step: Int): Unit =
- if (step != 0) /* c1 */ d.name should be("dir" + step)
+ if (step != 0) /* c1 */
+ d.name should be("dir" + step)
 }
 <<< #2113 def 4
 object a {