Use local fresh indices for lifted classes in diferent packages

Author: nicolasstucki

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

@@ -33,12 +33,13 @@ class LiftedClasses extends MiniPhaseTransform with SymTransformer { thisTransfo
 
   /* Makes a new unique name based on a unique name that was flatten */
   private def refreshedName(sym: Symbol)(implicit ctx: Context): TypeName = {
-    // TODO: Refresh names not only based on their full name?
-    //       Include package to distinguish <class>$anon from <pack>.<class>$anon
+    val packName = sym.owner.fullName.toString
     val name = sym.name
-    val newName = (name.firstPart.toString + str.NAME_JOIN + name.lastPart).toTermName
+    val newName = (packName + name.firstPart + str.NAME_JOIN + name.lastPart).toTermName
 
     var freshName = UniqueName.fresh(newName).toTypeName
+    val prefix = if (sym.owner.isEmptyPackage) "$empty$" else packName
+    freshName = freshName.toString.substring(prefix.length).toTypeName
     if (name.toSimpleName.endsWith(str.MODULE_SUFFIX))
       freshName = (freshName + str.MODULE_SUFFIX).toTypeName
 

tests/run/i2964e.check

@@ -0,0 +1,4 @@
+class foo.bar.Foo$$anon$1
+class foo.bar.Foo$$anon$2
+class foo.Foo$$anon$1
+class Foo$$anon$1

tests/run/i2964e.scala

@@ -0,0 +1,32 @@
+
+object Test {
+  def main(args: Array[String]): Unit = {
+    new foo.bar.Foo
+    new foo.Foo
+    new Foo
+  }
+}
+
+package foo {
+  package bar {
+    class Foo {
+      new Object {
+        println(this.getClass) // Foo$$anon$1
+      }
+      new Object {
+        println(this.getClass) // Foo$$anon$2
+      }
+    }
+  }
+  class Foo {
+    new Object {
+      println(this.getClass) // Foo$$anon$1
+    }
+  }
+}
+
+class Foo {
+  new Object {
+    println(this.getClass) // Foo$$anon$1
+  }
+}

tests/run/i3000b.check

@@ -1,2 +1,2 @@
 Foo$$anon$1
-bar.Bar$$anon$2
+bar.Bar$$anon$1