Fix: wrap extensions in toplevel package objects

Author: odersky

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -1268,7 +1268,7 @@ object desugar {
   }
 
   private def isTopLevelDef(stat: Tree)(using Context): Boolean = stat match
-    case _: ValDef | _: PatDef | _: DefDef | _: Export => true
+    case _: ValDef | _: PatDef | _: DefDef | _: Export | _: ExtMethods => true
     case stat: ModuleDef =>
       stat.mods.isOneOf(GivenOrImplicit)
     case stat: TypeDef =>

tests/pos/i6565.scala

@@ -3,8 +3,8 @@ class Err
 type Lifted[A] = Err | A
 
 def point[O](o: O): Lifted[O] = o
-def [O, U](o: Lifted[O]).map(f: O => U): Lifted[U] = ???
-def [O, U](o: Lifted[O]).flatMap(f: O => Lifted[U]): Lifted[U] = ???
+extension [O, U](o: Lifted[O]) def map(f: O => U): Lifted[U] = ???
+extension [O, U](o: Lifted[O]) def flatMap(f: O => Lifted[U]): Lifted[U] = ???
 
 val error: Err = Err()
 

tests/pos/i7041.scala

@@ -1,12 +1,13 @@
 import scala.util.control.NonLocalReturns._
 
-inline def [T, E <: Throwable](op: => T) rescue (fallback: PartialFunction[E, T]) =
-  try op
-  catch {
-    case ex: ReturnThrowable[_] => throw ex
-    case ex: E =>
-      if (fallback.isDefinedAt(ex))  fallback(ex) else throw ex
-  }
+extension [T, E <: Throwable](op: => T)
+  inline def rescue (fallback: PartialFunction[E, T]) =
+    try op
+    catch {
+      case ex: ReturnThrowable[_] => throw ex
+      case ex: E =>
+        if (fallback.isDefinedAt(ex))  fallback(ex) else throw ex
+    }
 
 def test: Unit = {
   9 / 0 rescue { case _: ArithmeticException => 10 }

tests/pos/i7458.scala

@@ -1,3 +1,3 @@
 type Tr[+V1, +O1 <: V1]
-def [V2, O2 <: V2](tr: Tr[V2, O2]) sl: Tr[V2, O2] = ???
+extension [V2, O2 <: V2](tr: Tr[V2, O2]) def sl: Tr[V2, O2] = ???
 def as[V3, O3 <: V3](tr: Tr[V3, O3]) : Tr[V3, O3] = tr.sl