From 8437d83e96df1579c27b5abe15f752bde83c7994 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Thu, 21 Nov 2024 13:51:15 -0800 Subject: [PATCH] RedundantParens: enable infixSide in tests --- .../resources/rewrite/RedundantParens.stat | 42 +++++++++++++++++++ .../test/scala/org/scalafmt/FormatTests.scala | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/scalafmt-tests/shared/src/test/resources/rewrite/RedundantParens.stat b/scalafmt-tests/shared/src/test/resources/rewrite/RedundantParens.stat index 1b60c1db38..ec0f3af349 100644 --- a/scalafmt-tests/shared/src/test/resources/rewrite/RedundantParens.stat +++ b/scalafmt-tests/shared/src/test/resources/rewrite/RedundantParens.stat @@ -1,4 +1,5 @@ rewrite.rules = [RedundantParens] +rewrite.redundantParens.infixSide = some <<< basic object a { def c(b: List[Int]): List[Int] = @@ -553,6 +554,29 @@ object a { ) } >>> +Idempotency violated +=> Diff (- obtained, + expected) + case false => false +- + e ++ + e + val b = c + (d match +<<< #2194 6 match with parens, dot and no braces, !infixSide +runner.dialect = scala3 +rewrite.redundantParens.infixSide = null +=== +object a { + val b = c + (d.match + case true => true + case false => false) + val b = c + (d.match + case true => true + case false => false) + e + val b = c + (d match + case true => true + case false => false + ) +} +>>> object a { val b = c + (d.match case true => true @@ -940,6 +964,22 @@ object a { (new foo(bar).baz) * qux } >>> +object a { + foo * new bar + foo * new bar(baz).qux + new foo * bar + new foo(bar).baz * qux +} +<<< infix with new, !infixSide +rewrite.redundantParens.infixSide = null +=== +object a { + foo * (new bar) + foo * (new bar(baz).qux) + (new foo) * bar + (new foo(bar).baz) * qux +} +>>> object a { foo * (new bar) foo * (new bar(baz).qux) @@ -987,6 +1027,8 @@ object a { new foo(bar: baz) } <<< infix expressions with infixSide = null +rewrite.redundantParens.infixSide = null +=== object a { // null+ foo & (0) // literal diff --git a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala index 91b4967ff6..64a6829812 100644 --- a/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala +++ b/scalafmt-tests/shared/src/test/scala/org/scalafmt/FormatTests.scala @@ -144,7 +144,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, 1084572, "total explored") + assertEquals(explored, 1084768, "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 :'(