Test AvoidInfix w/ fold, redundant braces, else

scalameta · Oct 22, 2024 · 0186bc9 · 0186bc9
1 parent 4e207e2
commit 0186bc9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/scalafmt-tests/shared/src/test/resources/rewrite/AvoidInfix.stat b/scalafmt-tests/shared/src/test/resources/rewrite/AvoidInfix.stat
@@ -727,3 +727,17 @@ object a {
   try (new compiler.Run).compile(sourceFiles.map(_.toString))
   catch { case ex: Throwable => }
 }
+<<< #4133 avoid infix, with arg in rewritten braces just before `else`
+maxColumn = 76
+newlines.source = fold
+newlines.avoidForSimpleOverflow = [tooLong, punct, slc]
+rewrite.rules = [RedundantBraces, RedundantParens, AvoidInfix]
+===
+def primaryConstructor: Option[MemberImpl with Constructor] = if (isClass) constructors find { _.isPrimary } else None
+>>>
+Idempotency violated
+=> Diff (- obtained, + expected)
+ def primaryConstructor: Option[MemberImpl with Constructor] =
+-  if (isClass) constructors.find(_.isPrimary) else None
++  if (isClass) constructors.find(_.isPrimary)
++  else None
diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala
@@ -138,7 +138,7 @@ class FormatTests extends FunSuite with CanRunTests with FormatAssertions {
     val explored = Debug.explored.get()
     logger.debug(s"Total explored: $explored")
     if (!onlyUnit && !onlyManual)
-      assertEquals(explored, 1483242, "total explored")
+      assertEquals(explored, 1483317, "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 :'(