Move match as infix lhs test to all OptionalBraces

scalameta · Jul 6, 2023 · 39249ab · 39249ab
1 parent 0d04137
commit 39249ab
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 39 deletions.
diff --git a/scalafmt-tests/src/test/resources/scala3/Match.stat b/scalafmt-tests/src/test/resources/scala3/Match.stat
@@ -325,42 +325,3 @@ case head :: tail =>
   )
 case Nil => Nil
 }
-<<< match as infix lhs, with rewrite
-rewrite.scala3.removeOptionalBraces = yes
-===
-def foo(url: String) = {
-  url match {
-    case "foo" => Some("")
-    case _ => None
-  } map { img =>
-    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
-  }
-}
->>>
-def foo(url: String) =
-  url match {
-    case "foo" => Some("")
-    case _     => None
-  } map { img =>
-    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
-  }
-<<< match as select lhs, with rewrite
-rewrite.scala3.removeOptionalBraces = yes
-===
-def foo(url: String) = {
-  url.match {
-    case "foo" => Some("")
-    case _ => None
-  }.map { img =>
-    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
-  }
-}
->>>
-def foo(url: String) =
-  url
-    .match
-      case "foo" => Some("")
-      case _     => None
-    .map { img =>
-      Html(s"""<img class="embed" src="$img" alt="$url"/>""")
-    }
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces.stat
@@ -5004,3 +5004,42 @@ object A:
    new Foo("xyz"):
       print("msg")
    .bar()
+<<< match as infix lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url match {
+    case "foo" => Some("")
+    case _ => None
+  } map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) =
+  url match {
+    case "foo" => Some("")
+    case _     => None
+  } map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+<<< match as select lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url.match {
+    case "foo" => Some("")
+    case _ => None
+  }.map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) =
+  url
+    .match
+       case "foo" => Some("")
+       case _     => None
+    .map { img =>
+      Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+    }
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_fold.stat
@@ -4789,3 +4789,36 @@ object A:
    new Foo("xyz"):
       print("msg")
    .bar()
+<<< match as infix lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url match {
+    case "foo" => Some("")
+    case _ => None
+  } map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) =
+  url match {
+    case "foo" => Some("")
+    case _     => None
+  } map { img => Html(s"""<img class="embed" src="$img" alt="$url"/>""") }
+<<< match as select lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url.match {
+    case "foo" => Some("")
+    case _ => None
+  }.map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) = url.match
+   case "foo" => Some("")
+   case _     => None
+.map { img => Html(s"""<img class="embed" src="$img" alt="$url"/>""") }
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_keep.stat
@@ -5036,3 +5036,41 @@ object A:
    new Foo("xyz"):
       print("msg")
    .bar()
+<<< match as infix lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url match {
+    case "foo" => Some("")
+    case _ => None
+  } map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) =
+  url match {
+    case "foo" => Some("")
+    case _     => None
+  } map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+<<< match as select lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url.match {
+    case "foo" => Some("")
+    case _ => None
+  }.map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) =
+  url.match
+     case "foo" => Some("")
+     case _     => None
+  .map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
diff --git a/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat b/scalafmt-tests/src/test/resources/scala3/OptionalBraces_unfold.stat
@@ -5157,3 +5157,46 @@ object A:
    new Foo("xyz"):
       print("msg")
    .bar()
+<<< match as infix lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url match {
+    case "foo" => Some("")
+    case _ => None
+  } map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) =
+  url match {
+    case "foo" =>
+      Some("")
+    case _ =>
+      None
+  } map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+<<< match as select lhs, with rewrite
+rewrite.scala3.removeOptionalBraces = yes
+===
+def foo(url: String) = {
+  url.match {
+    case "foo" => Some("")
+    case _ => None
+  }.map { img =>
+    Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+  }
+}
+>>>
+def foo(url: String) =
+  url
+    .match
+       case "foo" =>
+         Some("")
+       case _ =>
+         None
+    .map { img =>
+      Html(s"""<img class="embed" src="$img" alt="$url"/>""")
+    }