FormatOps: can't look at breaks for fold/unfold

scalameta · Apr 1, 2024 · d145a9c · d145a9c
1 parent 91e203b
commit d145a9c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 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
@@ -167,7 +167,7 @@ class FormatOps(
       case _: T.RightParen if start.left.is[T.LeftParen] => None
       case c: T.Comment if start.noBreak && tokens.isBreakAfterRight(start) =>
         Some(c)
-      case _ if start.noBreak && isInfix => None
+      case _ if !style.newlines.formatInfix && start.noBreak && isInfix => None
       case _ => Some(start.left)
     }
 

diff --git a/scalafmt-tests/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/src/test/resources/newlines/source_fold.stat
@@ -150,10 +150,8 @@ object a {
 }
 >>>
 object a {
-  the[Exception] thrownBy {
-    SizeUtils.calculate(segments, "user")
-  } should have message
-    """Cannot resolve column name "user" among (segment_id);"""
+  the[Exception] thrownBy { SizeUtils.calculate(segments, "user") } should
+    have message """Cannot resolve column name "user" among (segment_id);"""
 }
 <<< 1.c.1: block followed by an infix, overflowing if no break
 maxColumn = 80
@@ -163,10 +161,8 @@ object a {
 }
 >>>
 object a {
-  the[Exception] thrownBy {
-    SizeUtils.calculate(segments, "user")
-  } should have message
-    """Cannot resolve column name "user" among (segment_id);"""
+  the[Exception] thrownBy { SizeUtils.calculate(segments, "user") } should
+    have message """Cannot resolve column name "user" among (segment_id);"""
 }
 <<< 1.c.2: block followed by an infix, overflowing if no break
 maxColumn = 80

diff --git a/scalafmt-tests/src/test/resources/rewrite/RedundantBraces.stat b/scalafmt-tests/src/test/resources/rewrite/RedundantBraces.stat
@@ -1706,11 +1706,11 @@ object a {
     } tag (ScalafmtTagPack: _*)
 }
 >>>
-Idempotency violated
-=> Diff (- obtained, + expected)
-       session: FormatSession
--  ) = Def.task(session.checkTrackedSources(sources, dirs)) tag
--    (ScalafmtTagPack: _*)
-+  ) =
-+    Def.task(session.checkTrackedSources(sources, dirs)) tag (ScalafmtTagPack: _*)
- }
+object a {
+  private def scalafmtCheckTask(
+      sources: Seq[File],
+      dirs: Seq[File],
+      session: FormatSession
+  ) = Def.task(session.checkTrackedSources(sources, dirs)) tag
+    (ScalafmtTagPack: _*)
+}