Fix type of modue objects

Author: nicolasstucki

library/src/scala/tasty/util/ShowSourceCode.scala

@@ -105,8 +105,14 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           }
         }
 
+        def keepDefinition(d: Definition): Boolean = {
+          val flags = d.flags
+          import flags._
+          !isParam && !isParamAccessor // && !isSynthetic // TODO: should print synthetic methods?
+        }
+
         val stats1 = stats.collect {
-          case stat@Definition() if !stat.flags.isParam && !stat.flags.isParamAccessor => stat
+          case stat @ Definition() if keepDefinition(stat) => stat
           case stat@Import(_, _) => stat
           case stat@Term() => stat
         }
@@ -377,9 +383,9 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
     def printTypeTrees(typesTrees: List[TypeTree], sep: String): Buffer = {
       def printSeparated(list: List[TypeTree]): Unit = list match {
         case Nil =>
-        case x :: Nil => printTypeTree(x)
+        case x :: Nil => printTypeTreeTop(x)
         case x :: xs =>
-          printTypeTree(x)
+          printTypeTreeTop(x)
           this += sep
           printSeparated(xs)
       }
@@ -551,6 +557,12 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
         printTypeTree(tpt)
     }
 
+    def printTypeTreeTop(tree: TypeTree): Buffer = tree match {
+      case TypeTree.Synthetic() => printTypeTop(tree.tpe)
+      case TypeTree.TypeIdent(name) => printTypeTop(tree.tpe)
+      case _ => printTypeTree(tree)
+    }
+
     def printTypeTree(tree: TypeTree): Buffer = tree match {
       case TypeTree.Synthetic() =>
         printType(tree.tpe)
@@ -615,13 +627,25 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       case tpe@Type() => printType(tpe)
     }
 
+    def printTypeTop(tree: Type): Buffer = tree match {
+      case Type.TypeRef(name, prefix) =>
+        prefix match {
+          case NoPrefix() | Type.ThisType(Types.EmptyPackage()) =>
+          case prefix@Type() => printType(prefix) += "."
+        }
+        if (name.endsWith("$")) this += name.stripSuffix("$") += ".type"
+        else this += name
+      case _ => printType(tree)
+    }
+
     def printType(tpe: Type): Buffer = tpe match {
       case Type.ConstantType(const) =>
         printConstant(const)
 
       case Type.SymRef(sym, prefix) =>
         prefix match {
           case Type.ThisType(Types.EmptyPackage() | Types.RootPackage()) =>
+          case Type.ThisType(Type.SymRef(ClassDef(_, _, _, _, _), _)) =>
           case prefix@Type.SymRef(ClassDef(_, _, _, _, _), _) =>
             printType(prefix)
             this += "#"
@@ -648,9 +672,7 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
       case Type.TypeRef(name, prefix) =>
         prefix match {
           case NoPrefix() | Type.ThisType(Types.EmptyPackage()) =>
-          case prefix@Type() =>
-            printType(prefix)
-            this += "."
+          case prefix@Type() => printType(prefix) += "."
         }
         this += name.stripSuffix("$")
 

tests/pos/i2104.decompiled

@@ -2,26 +2,26 @@
 class Cons[H, T]() extends java.lang.Object
 object Cons {
   def apply[H, T](h: H, t: T): Cons[H, T] = scala.Predef.???
-  def unapply[H, T](t: Cons[H, T]): scala.Option[<empty>.Pair[H, T]] = scala.Predef.???
+  def unapply[H, T](t: Cons[H, T]): scala.Option[Pair[H, T]] = scala.Predef.???
 }/** Decompiled from out/posTestFromTasty/pos/i2104/Pair.class */
 case class Pair[A, B](_1: A, _2: B) {
   def copy[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any](_1: A, _2: B): Pair[A, B] = new Pair[A, B](_1, _2)
-  def copy$default$1[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any]: Pair.A = (Pair._1: Pair._1)
-  def copy$default$2[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any]: Pair.B = (Pair._2: Pair._2)
+  def copy$default$1[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any]: A = (_1: _1)
+  def copy$default$2[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any]: B = (_2: _2)
   override def hashCode(): scala.Int = {
     var acc: scala.Int = 2479866
-    acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(Pair._1))
-    acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(Pair._2))
+    acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(_1))
+    acc = scala.runtime.Statics.mix(acc, scala.runtime.Statics.anyHash(_2))
     scala.runtime.Statics.finalizeHash(acc, 2)
   }
   override def equals(x$0: scala.Any): scala.Boolean = this.eq(x$0.asInstanceOf[java.lang.Object]).||(x$0 match {
-    case x$0: Pair[Pair.A, Pair.B] =>
+    case x$0: Pair[A, B] =>
       this._1.==(x$0._1).&&(this._2.==(x$0._2))
     case _ =>
       false
   })
   override def toString(): java.lang.String = scala.runtime.ScalaRunTime._toString(this)
-  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[Pair[Pair.A, Pair.B]]
+  override def canEqual(that: scala.Any): scala.Boolean = that.isInstanceOf[Pair[A, B]]
   override def productArity: scala.Int = 2
   override def productPrefix: java.lang.String = "Pair"
   override def productElement(n: scala.Int): scala.Any = n match {
@@ -39,12 +39,12 @@ object Pair extends scala.AnyRef {
 }/** Decompiled from out/posTestFromTasty/pos/i2104/Test.class */
 object Test {
   def main(args: scala.Array[scala.Predef.String]): scala.Unit = {
-    <empty>.Cons.apply[scala.Option[scala.Int], scala.None](scala.Option.apply[scala.Int](1), scala.None) match {
-      case <empty>.Cons.unapply[scala.Option[scala.Int], scala.None](, scala.None) =>
+    Cons.apply[scala.Option[scala.Int], scala.None.type](scala.Option.apply[scala.Int](1), scala.None) match {
+      case Cons(_: scala.Some[scala.Int], scala.None) =>
         {
           (i: scala.Int)
           dotty.DottyPredef.assert(i.==(1))
         }
     }
   }
-}
+}