Test scala3 for-yield in parens with semicolon

scalameta · Oct 7, 2024 · d144b1a · d144b1a
1 parent 6c34ea9
commit d144b1a
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 1 deletion.
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
@@ -10422,3 +10422,19 @@ object A {
         (Seq(), Seq())
   ): Unit = ???
 }
+<<< #4219
+object a {
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+}
+>>>
+object a {
+  val expression =
+    for (
+      x <-
+        loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+      y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+    ) yield x + y
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -9730,3 +9730,18 @@ object A {
         (Seq(), Seq())
   ): Unit = ???
 }
+<<< #4219
+object a {
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+}
+>>>
+object a {
+  val expression = for (
+    x <-
+      loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
@@ -10172,3 +10172,19 @@ object A {
   def f(a: (Seq[Int], Seq[Int]) =
     (Seq(), Seq())): Unit = ???
 }
+<<< #4219
+object a {
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+}
+>>>
+object a {
+  val expression = for (
+    x <-
+      loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <-
+      loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+}
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
@@ -10530,3 +10530,19 @@ object A {
         (Seq(), Seq())
   ): Unit = ???
 }
+<<< #4219
+object a {
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+}
+>>>
+object a {
+  val expression =
+    for (
+      x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+      y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+    )
+      yield x + y
+}
diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces.stat
@@ -7342,3 +7342,17 @@ object Parsers:
    enum Location(inArgs: Boolean):
       case InPatternArgs extends Location(false, true,
             true) // InParens not true, since it might be an alternative
+<<< #4219
+object a:
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+>>>
+object a:
+   val expression = for (
+     x <-
+       loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+     y <-
+       loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+   ) yield x + y
diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -7062,3 +7062,17 @@ object Parsers:
       case InPatternArgs extends Location(
             false, true, true
           ) // InParens not true, since it might be an alternative
+<<< #4219
+object a:
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+>>>
+object a:
+   val expression = for (
+     x <-
+       loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+     y <-
+       loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+   ) yield x + y
diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -7372,3 +7372,17 @@ object Parsers:
    enum Location(inArgs: Boolean):
       case InPatternArgs extends Location(false, true,
             true) // InParens not true, since it might be an alternative
+<<< #4219
+object a:
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+>>>
+object a:
+   val expression = for (
+     x <-
+       loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+     y <-
+       loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+   ) yield x + y
diff --git a/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/shared/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -7634,3 +7634,17 @@ object Parsers:
       case InPatternArgs extends Location(
             false, true, true
           ) // InParens not true, since it might be an alternative
+<<< #4219
+object a:
+  val expression = for (
+    x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+    y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+  ) yield x + y
+>>>
+object a:
+   val expression =
+     for (
+       x <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu;
+       y <- loremipsumdolorsitametconsecteturadipiscingelitseddoeiusmodtemporincididu
+     )
+       yield x + y
diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -137,7 +137,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
   override def afterAll(): Unit = {
     logger.debug(s"Total explored: ${Debug.explored}")
     if (!onlyUnit && !onlyManual)
-      assertEquals(Debug.explored, 1784976, "total explored")
+      assertEquals(Debug.explored, 1785537, "total explored")
     val results = debugResults.result()
     // TODO(olafur) don't block printing out test results.
     // I don't want to deal with scalaz's Tasks :'(