Fix handling of end markers for nested packages

Author: odersky

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

@@ -3716,23 +3716,23 @@ object Parsers {
               ts ++= topStatSeq()
             }
           }
-          else {
+          else
             val pkg = qualId()
+            var continue = false
             indentRegion(pkg) {
               possibleTemplateStart()
-              if (in.token == EOF)
+              if in.token == EOF then
                 ts += makePackaging(start, pkg, List())
-              else if (in.isNestedStart) {
+              else if in.isNestedStart then
                 ts += inDefScopeBraces(makePackaging(start, pkg, topStatSeq()))
-                acceptStatSepUnlessAtEnd()
-                ts ++= topStatSeq()
-              }
-              else {
+                continue = true
+              else
                 acceptStatSep()
                 ts += makePackaging(start, pkg, topstats())
-              }
             }
-          }
+            if continue then
+              acceptStatSepUnlessAtEnd()
+              ts ++= topStatSeq()
         }
         else
           ts ++= topStatSeq()

tests/pos/packagings.scala

@@ -0,0 +1,10 @@
+package foo with
+  package bar with
+    object A with
+      def foo = 1
+  end bar
+end foo
+package baz with
+  object B with
+    def f = foo.bar.A.foo
+end baz