Merge pull request #11602 from Kordyjan/excessive-ends

Skip empty statements around end markers

Author: nicolasstucki

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -364,11 +364,15 @@ object Parsers {
       if in.isNewLine then in.nextToken() else accept(SEMI)
 
     def acceptStatSepUnlessAtEnd[T <: Tree](stats: ListBuffer[T], altEnd: Token = EOF): Unit =
+      def skipEmptyStats(): Unit =
+        while (in.token == SEMI || in.token == NEWLINE || in.token == NEWLINES) do in.nextToken()
+
       in.observeOutdented()
       in.token match
         case SEMI | NEWLINE | NEWLINES =>
-          in.nextToken()
+          skipEmptyStats()
           checkEndMarker(stats)
+          skipEmptyStats()
         case `altEnd` =>
         case _ =>
           if !isStatSeqEnd then

tests/neg/i11581.scala

@@ -0,0 +1,33 @@
+class Abc:
+  def a = {
+    println(10)
+    10
+  }
+
+  ;  ;
+
+  end a
+  end a // error
+;  ;
+end Abc
+end Abc // error
+
+class D:
+end D
+end D // error
+
+class Xyz {
+  def a =
+    println(10)
+    10
+
+}
+
+
+;
+end Xyz
+;
+;
+
+end Xyz // error
+

tests/pos/i11581.scala

@@ -0,0 +1,27 @@
+class Abc:
+  def a = {
+    println(10)
+    10
+  }
+
+  ;  ;
+
+  end a
+
+
+;  ;
+
+end Abc
+
+class Xyz {
+  def a =
+    println(10)
+    10
+
+}
+
+
+; ;
+;
+
+end Xyz