Merge pull request #434 from scala/backport-lts-3.3-23236

Backport "Fix scala#23194: Try to handle SkolemTypes in SingletonTypeTree during pickling" to 3.3 LTS

Author: tgodzik

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -37,7 +37,8 @@ object ScalaSettings:
     ScalaRelease.values.toList.map(_.show)
 
   def supportedSourceVersions: List[String] =
-    SourceVersion.values.toList.map(_.toString)
+    SourceVersion.values.diff(SourceVersion.illegalInSettings)
+      .map(_.toString).toList
 
   def defaultClasspath: String = sys.env.getOrElse("CLASSPATH", ".")
 

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

@@ -630,8 +630,13 @@ class TreePickler(pickler: TastyPickler) {
         case tree: TypeTree =>
           pickleType(tree.tpe)
         case SingletonTypeTree(ref) =>
-          writeByte(SINGLETONtpt)
-          pickleTree(ref)
+          val tp = ref.tpe
+          val tp1 = tp.deskolemized
+          if tp1 ne tp then
+            pickleType(tp1)
+          else
+            writeByte(SINGLETONtpt)
+            pickleTree(ref)
         case RefinedTypeTree(parent, refinements) =>
           if (refinements.isEmpty) pickleTree(parent)
           else {

tests/neg/indentRight.scala

@@ -24,8 +24,8 @@ object Test {
   }
 
   trait A
-    case class B() extends A  // error: Line is indented too far to the right
-    case object C extends A   // error: Line is indented too far to the right
+    case class B() extends A
+    case object C extends A
 
   if (true)   // OK
     println("hi")

tests/pos/i23194.scala

@@ -0,0 +1,14 @@
+class R[T] extends annotation.StaticAnnotation
+
+class A[T]:
+  val next: A[T] = null
+  val self: this.type = this
+  val selfnext: this.next.type = this.next
+  def f: (A[T] @R[this.type], A[T] @R[this.next.type]) = ???
+  def g: (A[T] @R[self.type], A[T] @R[selfnext.type]) = ???
+
+class Test:
+  def test =
+    val (a, b) = A[String]().f
+    val (a2, b2) = A[String]().g
+