Add tests with opt-braces rewrite and if-cond

scalameta · Jul 7, 2023 · b3bd9ce · b3bd9ce
1 parent 967040e
commit b3bd9ce
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 0 deletions.
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -876,6 +876,57 @@ object a:
             stat4
          end if
       end cond
+<<< remove optional braces within if-cond
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if {
+     bar &&
+     baz
+  } then
+     foo
+>>>
+Idempotency violated
+private def mtd: Res =
+-  if bar &&
++  if
++     bar &&
+     baz
+  then foo
+<<< remove optional braces within else-if
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then
+      barBody
+    else bazBody
+  }
+>>>
+Idempotency violated
+private def mtd: Res =
+   if foo then fooBody
+-  else if bar then barBody
+-  else bazBody
++  else
++     if bar then barBody
++     else bazBody
+<<< remove optional braces within else-if 2
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then barBody else bazBody
+  }
+>>>
+Idempotency violated
+private def mtd: Res =
+  if foo then fooBody
+-  else if bar then barBody
+-  else bazBody
++  else if bar then barBody else bazBody
 <<< rewrite with given-with
 rewrite.scala3.removeOptionalBraces = oldSyntaxToo
 ===

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -821,6 +821,44 @@ object a:
             stat4
          end if
       end cond
+<<< remove optional braces within if-cond
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if {
+     bar &&
+     baz
+  } then
+     foo
+>>>
+Idempotency violated
+-private def mtd: Res = if bar && baz then foo
++private def mtd: Res =
++  if
++     bar && baz
++  then foo
+<<< remove optional braces within else-if
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then
+      barBody
+    else bazBody
+  }
+>>>
+private def mtd: Res = if foo then fooBody else if bar then barBody else bazBody
+<<< remove optional braces within else-if 2
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then barBody else bazBody
+  }
+>>>
+private def mtd: Res = if foo then fooBody else if bar then barBody else bazBody
 <<< rewrite with given-with
 rewrite.scala3.removeOptionalBraces = oldSyntaxToo
 ===

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -875,6 +875,58 @@ object a:
             stat4
          end if
       end cond
+<<< remove optional braces within if-cond
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if {
+     bar &&
+     baz
+  } then
+     foo
+>>>
+private def mtd: Res =
+  if
+     bar &&
+     baz
+  then
+     foo
+<<< remove optional braces within else-if
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then
+      barBody
+    else bazBody
+  }
+>>>
+Idempotency violated
+private def mtd: Res =
+  if foo then fooBody
+-  else if bar then
+-     barBody
+-  else bazBody
++  else
++     if bar then
++        barBody
++     else bazBody
+<<< remove optional braces within else-if 2
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then barBody else bazBody
+  }
+>>>
+Idempotency violated
+private def mtd: Res =
+  if foo then fooBody
+-  else if bar then barBody
+-  else bazBody
++  else if bar then barBody else bazBody
 <<< rewrite with given-with
 rewrite.scala3.removeOptionalBraces = oldSyntaxToo
 ===

diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -919,6 +919,63 @@ object a:
             stat4
          end if
       end cond
+<<< remove optional braces within if-cond
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if {
+     bar &&
+     baz
+  } then
+     foo
+>>>
+Idempotency violated
+private def mtd: Res =
+-  if bar && baz then
++  if
++     bar && baz
++  then
+     baz
+  then foo
+<<< remove optional braces within else-if
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then
+      barBody
+    else bazBody
+  }
+>>>
+Idempotency violated
+private def mtd: Res =
+  if foo then
+     fooBody
+-  else if bar then
+-     barBody
+   else
+-     bazBody
++     if bar then
++        barBody
++     else
++        bazBody
+<<< remove optional braces within else-if 2
+rewrite.scala3.removeOptionalBraces = yes
+===
+private def mtd: Res =
+  if foo then fooBody
+  else {
+    if bar then barBody else bazBody
+  }
+>>>
+private def mtd: Res =
+  if foo then
+     fooBody
+  else if bar then
+     barBody
+  else
+     bazBody
 <<< rewrite with given-with
 rewrite.scala3.removeOptionalBraces = oldSyntaxToo
 ===