bugfix: Show better error when no { is before case (#2830)

Related to scalacenter/scastie#636.
scalameta · Sep 4, 2022 · 646e962 · 646e962
1 parent 69fa613
commit 646e962
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala b/scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala
@@ -1388,7 +1388,9 @@ class ScalametaParser(input: Input)(implicit dialect: Dialect) { parser =>
     if (acceptOpt[Indentation.Indent]) {
       autoEndPos(t)(Term.Match(t, indentedAfterOpen(caseClauses())))
     } else {
-      autoEndPos(t)(Term.Match(t, inBracesOrNil(caseClauses())))
+      autoEndPos(t)(
+        Term.Match(t, inBracesOr(caseClauses(), syntaxErrorExpected[LeftBrace]))
+      )
     }
   }
 

diff --git a/tests/shared/src/test/scala/scala/meta/tests/parsers/ParseSuite.scala b/tests/shared/src/test/scala/scala/meta/tests/parsers/ParseSuite.scala
@@ -69,6 +69,21 @@ class ParseSuite extends TreeSuiteBase with CommonTrees {
   ): Unit =
     checkParsedTree(code, _.entrypointStat(), syntax)(tree)
 
+  protected def runTestError[T <: Tree](code: String, expected: String)(
+      implicit parser: String => T
+  ): Unit = {
+    val error = intercept[ParseException] {
+      val result = parser(code)
+      throw new ParseException(
+        Position.None,
+        s"Statement ${code} should not parse! Got result ${result.structure}"
+      )
+    }
+    assert(
+      error.getMessage.contains(expected),
+      s"Expected [${error.getMessage}] to contain [${expected}]."
+    )
+  }
 }
 
 object MoreHelpers {

diff --git a/tests/shared/src/test/scala/scala/meta/tests/parsers/TermSuite.scala b/tests/shared/src/test/scala/scala/meta/tests/parsers/TermSuite.scala
@@ -1397,6 +1397,16 @@ class TermSuite extends ParseSuite {
     )
   }
 
+  test("scala3-syntax") {
+
+    runTestError[Term](
+      """|() match
+         |  case _: Unit => ()""".stripMargin,
+      "error: { expected but case found"
+    )(term(_))
+
+  }
+
   test("using") {
     assertTerm("Set(using)") {
       Term.Apply(Term.Name("Set"), List(Term.Name("using")))

diff --git a/tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/BaseDottySuite.scala b/tests/shared/src/test/scala/scala/meta/tests/parsers/dotty/BaseDottySuite.scala
@@ -82,19 +82,4 @@ trait BaseDottySuite extends ParseSuite {
     assertLayout.foreach(assertNoDiff(reprintedCode, _, "Reprinted stat"))
   }
 
-  protected def runTestError[T <: Tree](code: String, expected: String)(
-      implicit parser: String => T
-  ): Unit = {
-    val error = intercept[ParseException] {
-      val result = parser(code)
-      throw new ParseException(
-        Position.None,
-        s"Statement ${code} should not parse! Got result ${result.structure}"
-      )
-    }
-    assert(
-      error.getMessage.contains(expected),
-      s"Expected [${error.getMessage}] to contain [${expected}]."
-    )
-  }
 }