Merge pull request #14519 from ckipp01/incompleteCatch

fix(parser): make empty catch an incomplete.
scala · Feb 21, 2022 · cf9525c · cf9525c
2 parents f19b850 + cd143da
commit cf9525c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -280,6 +280,12 @@ object Parsers {
         syntaxError(msg, offset)
         skip(stopAtComma = true)
 
+    def syntaxErrorOrIncomplete(msg: Message, span: Span): Unit =
+      if (in.token == EOF) incompleteInputError(msg)
+      else
+        syntaxError(msg, span)
+        skip(stopAtComma = true)
+
     /** Consume one token of the specified type, or
       * signal an error if it is not there.
       *
@@ -2003,7 +2009,7 @@ object Parsers {
           handler match {
             case Block(Nil, EmptyTree) =>
               assert(handlerStart != -1)
-              syntaxError(
+              syntaxErrorOrIncomplete(
                 EmptyCatchBlock(body),
                 Span(handlerStart, endOffset(handler))
               )

diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
@@ -300,4 +300,14 @@ class ReplVerboseTests extends ReplTest(ReplTest.defaultOptions :+ "-verbose"):
     run("val a = 42")
     assert(storedOutput().trim().endsWith("val a: Int = 42"))
   }
+
+  @Test def `i4393-incomplete-catch`: Unit = contextually {
+    assert(ParseResult.isIncomplete("""|try {
+                                       |  ???
+                                       |} catch""".stripMargin))
+    assert(ParseResult.isIncomplete("""|try {
+                                       |  ???
+                                       |} catch {""".stripMargin))
+  }
+
 end ReplVerboseTests