WIP

Fixes scala#13215

Author: nicolasstucki

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

@@ -12,7 +12,7 @@ import Symbols._, StdNames._, Annotations._, Trees._, Symbols._
 import Decorators._, DenotTransformers._
 import collection.{immutable, mutable}
 import util.{Property, SourceFile, NoSource}
-import NameKinds.{TempResultName, OuterSelectName}
+import NameKinds.{TempResultName, OuterSelectName, ModuleClassName}
 import typer.ConstFold
 
 import scala.annotation.tailrec
@@ -358,6 +358,17 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
     Block(cdef :: Nil, New(cls.typeRef, Nil))
   }
 
+  def topLevelModule(name: TermName, ddefs: List[Tree])(using Context): List[Tree] = {
+    val owner = ctx.owner// ddefs.head.symbol.owner
+    val moduleSym = newCompleteModuleSymbol(owner, name,
+      EmptyFlags, EmptyFlags, Nil, Scopes.newScopeWith(ddefs.map(_.symbol)*)).entered
+    val moduleClass = newNormalizedClassSymbol(owner, ModuleClassName(name).toTypeName, Synthetic | Final | Module, List(defn.ObjectType), selfInfo = moduleSym.termRef).entered
+    val constr = newConstructor(moduleClass, Synthetic, Nil, Nil).entered
+    val vdef = ValDef(moduleSym, ref(defn.Predef_undefined)) //Apply(New(moduleClass.typeRef).select(constr), Nil))
+    val cdef = ClassDef(moduleClass, DefDef(constr), ddefs.map(_.changeOwner(owner, moduleClass)))
+    List(vdef, cdef)
+  }
+
   def Import(expr: Tree, selectors: List[untpd.ImportSelector])(using Context): Import =
     ta.assignType(untpd.Import(expr, selectors), newImportSymbol(ctx.owner, expr))
 

compiler/src/dotty/tools/dotc/core/Symbols.scala

@@ -596,7 +596,7 @@ object Symbols {
       def complete(denot: SymDenotation)(using Context): Unit = {
         val cls = denot.asClass.classSymbol
         val decls = newScope
-        denot.info = ClassInfo(owner.thisType, cls, parentTypes.map(_.dealias), decls)
+        denot.info = ClassInfo(owner.thisType, cls, parentTypes.map(_.dealias), decls, selfInfo)
       }
     }
     newClassSymbol(owner, name, flags, completer, privateWithin, coord, assocFile)

compiler/src/dotty/tools/dotc/transform/AccessProxies.scala

@@ -133,8 +133,8 @@ abstract class AccessProxies {
       val accessed = reference.symbol.asTerm
       var accessorClass = hostForAccessorOf(accessed: Symbol)
       if (accessorClass.exists) {
-        if accessorClass.is(Package) then
-          accessorClass = ctx.owner.topLevelClass
+        // if accessorClass.is(Package) then
+        //   accessorClass = ctx.owner.topLevelClass
         val accessorName = accessorNameOf(accessed.name, accessorClass)
         val accessorInfo =
           accessed.info.ensureMethodic.asSeenFrom(accessorClass.thisType, accessed.owner)

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -2531,8 +2531,14 @@ class Typer extends Namer
         inContext(ctx.packageContext(tree, pkg)) {
           var stats1 = typedStats(tree.stats, pkg.moduleClass)._1
           if (!ctx.isAfterTyper)
-            stats1 = stats1 ++ typedBlockStats(MainProxies.mainProxies(stats1))._1
+            stats1 = stats1 ::: typedBlockStats(MainProxies.mainProxies(stats1))._1
+            val topLevelInlineAccessors = addAccessorDefs(pkg, Nil)
+            if topLevelInlineAccessors.nonEmpty then
+              val moduleStats = tpd.topLevelModule("Inline$Accessors".toTermName, topLevelInlineAccessors)
+              stats1 = stats1 ::: moduleStats
+
           cpy.PackageDef(tree)(pid1, stats1).withType(pkg.termRef)
+          // cpy.Template(tree)(body = Accessors.addAccessorDefs(tree.symbol.owner, tree.body))
         }
       case _ =>
         // Package will not exist if a duplicate type has already been entered, see `tests/neg/1708.scala`

tests/pos/i13215.scala

@@ -0,0 +1,6 @@
+package foo {
+  trait Bar:
+    inline def baz = Baz
+
+  private[foo] object Baz
+}