Merge pull request #4715 from dotty-staging/decompile-fix-module-ref

Fix printed references to module types

Author: nicolasstucki

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

@@ -737,14 +737,12 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
 
     def printTypeTree(tree: TypeTree): Buffer = tree match {
       case TypeTree.Synthetic() =>
+        // TODO try to move this logic into `printType`
         def printTypeAndAnnots(tpe: Type): Buffer = tpe match {
           case Type.AnnotatedType(tp, annot) =>
             printTypeAndAnnots(tp)
             this += " "
             printAnnotation(annot)
-          case tpe @ Type.TypeRef(name, _) if name.endsWith("$") =>
-            printType(tpe)
-            this += ".type"
           case Type.SymRef(ClassDef("Null$" | "Nothing$", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("runtime", _), NoPrefix()))) =>
             // scala.runtime.Null$ and scala.runtime.Nothing$ are not modules, those are their actual names
             printType(tpe)
@@ -857,7 +855,8 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           case NoPrefix() | Type.ThisType(Types.EmptyPackage()) =>
           case prefix@Type() => printType(prefix) += "."
         }
-        this += name.stripSuffix("$")
+        if (name.endsWith("$")) this += name.stripSuffix("$") += ".type"
+        else this += name
 
       case tpe @ Type.Refinement(_, _, _) =>
         printRefinement(tpe)
@@ -896,7 +895,16 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
           case Type.SymRef(cdef @ ClassDef(_, _, _, _, _), _) if !cdef.flags.isObject =>
             printFullClassName(tp)
             this += ".this"
-          case _ => printType(tp)
+          case Type.TypeRef(name, prefix) if name.endsWith("$") =>
+            prefix match {
+              case Types.EmptyPrefix() =>
+              case _ =>
+                printTypeOrBound(prefix)
+                this += "."
+            }
+            this += name.stripSuffix("$")
+          case _ =>
+            printType(tp)
         }
 
       case Type.TypeLambda(paramNames, tparams, body) =>

tests/run/t8100.decompiled

@@ -0,0 +1,8 @@
+/** Decompiled from out/runTestFromTasty/run/t8100/Test.class */
+object Test {
+  import scala.util.{Try}
+  def main(args: scala.Array[scala.Predef.String]): scala.Unit = {
+    def stream: collection.immutable.Stream[scala.None.type] = scala.Stream.from(0).take(100000).map[scala.None.type, collection.immutable.Stream[scala.None.type]](((n: scala.Int) => scala.None))(collection.immutable.Stream.canBuildFrom[scala.None.type])
+    scala.Predef.println(scala.util.Try.apply[scala.Int](stream.flatten[scala.Nothing](((xo: scala.None.type) => scala.Option.option2Iterable[scala.Nothing](xo))).length))
+  }
+}