Fix #348 flatten short name shouldn't include package names

Author: DarkDimius

src/dotty/tools/dotc/core/SymDenotations.scala

@@ -292,6 +292,21 @@ object SymDenotations {
         if (isType) fn.toTypeName else fn.toTermName
       }
 
+
+    /** The encoded flat name of this denotation, where joined names are separated by `separator` characters. */
+    def flatName(separator: Char = '$')(implicit ctx: Context): Name =
+      if (symbol == NoSymbol || owner == NoSymbol || owner.isEffectiveRoot || (owner is PackageClass)) name
+      else {
+        var owner = this
+        var sep = ""
+        do {
+          owner = owner.owner
+          sep += separator
+        } while (!owner.isClass && !owner.isPackageObject)
+        val fn = owner.flatName(separator) ++ sep ++ name
+        if (isType) fn.toTypeName else fn.toTermName
+      }
+
     /** `fullName` where `.' is the separator character */
     def fullName(implicit ctx: Context): Name = fullNameSeparated('.')
 

src/dotty/tools/dotc/transform/Flatten.scala

@@ -19,7 +19,7 @@ class Flatten extends MiniPhaseTransform with SymTransformer { thisTransform =>
   def transformSym(ref: SymDenotation)(implicit ctx: Context) = {
     if (ref.isClass && !ref.is(Package) && !ref.owner.is(Package)) {
       ref.copySymDenotation(
-        name = ref.flatName,
+        name = ref.flatName(),
         owner = ref.enclosingPackageClass)
     }
     else ref

src/dotty/tools/dotc/transform/SymUtils.scala

@@ -93,7 +93,7 @@ class SymUtils(val self: Symbol) extends AnyVal {
     self.owner.info.decl(self.asTerm.name.fieldName).suchThat(!_.is(Method)).symbol
 
   /** `fullName` where `$' is the separator character */
-  def flatName(implicit ctx: Context): Name = self.fullNameSeparated('$')
+  def flatName(implicit ctx: Context): Name = self.flatName('$')
 
   def initializer(implicit ctx: Context): TermSymbol =
     self.owner.info.decl(InitializerName(self.asTerm.name)).symbol.asTerm