Merge pull request #4642 from dotty-staging/fix-tasty-relect-singletons

Fix tasty reflect singletons

Author: liufengyun

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

@@ -128,7 +128,8 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
               case _ => false
             })
           }
-          !flags.isParam && !flags.isParamAccessor && !isCaseClassUnOverridableMethod
+          def isInnerModuleObject = d.flags.isLazy && d.flags.isObject
+          !flags.isParam && !flags.isParamAccessor && !isCaseClassUnOverridableMethod && !isInnerModuleObject
         }
         val stats1 = stats.collect {
           case stat@Definition() if keepDefinition(stat) => stat
@@ -623,6 +624,10 @@ class ShowSourceCode[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
 
       case TypeTree.Singleton(ref) =>
         printTree(ref)
+        ref match {
+          case Term.Literal(_) => this
+          case _ => this += ".type"
+        }
 
       case TypeTree.Refined(tpt, refinements) =>
         printTypeTree(tpt)

tests/pos/simpleSingleton.decompiled

@@ -0,0 +1,14 @@
+/** Decompiled from out/posTestFromTasty/pos/simpleSingleton/Foo.class */
+class Foo() {
+  def foo(x: scala.Int): scala.Unit = {
+    val a: x.type = x
+    val b: Foo.type = Foo
+    val c: Foo.Bar.type = Foo.Bar
+    val d: 1 = 1
+    val e: "abc" = "abc"
+    ()
+  }
+}
+object Foo {
+  object Bar
+}

tests/pos/simpleSingleton.scala

@@ -0,0 +1,13 @@
+class Foo {
+  def foo(x: Int) = {
+    val a: x.type = x
+    val b: Foo.type = Foo
+    val c: Foo.Bar.type = Foo.Bar
+    val d: 1 = 1
+    val e: "abc" = "abc"
+  }
+}
+
+object Foo {
+  object Bar
+}