Pull the special erasure of wildcards up to the ContextFunction extractor.

That is their only source. In general, it makes no sense to erase a wildcard. It only makes sense in that particular place because the compiler later turns those type arguments into actual arguments and result types, where it picks their upper bound.

Author: sjrd

modules/unpickler/src/main/scala/ch/epfl/scala/debugadapter/internal/stacktrace/Scala3Unpickler.scala

@@ -917,11 +917,12 @@ class Scala3Unpickler(
  checkTypeErasure: Boolean = true
  ): Boolean =
  object CurriedContextFunction:
- def unapply(tpe: Type): Option[(Seq[TypeOrWildcard], TypeOrWildcard)] =
- def rec(tpe: TypeOrWildcard, args: Seq[TypeOrWildcard]): Option[(Seq[TypeOrWildcard], TypeOrWildcard)] =
+ def unapply(tpe: Type): Option[(Seq[Type], Type)] =
+ def rec(tpe: TypeOrWildcard, args: Seq[Type]): Option[(Seq[Type], Type)] =
  tpe match
- case tpe: AppliedType if tpe.tycon.isContextFunction => rec(tpe.args.last, args ++ tpe.args.init)
- case res => Option.when(args.nonEmpty)((args, res))
+ case tpe: AppliedType if tpe.tycon.isContextFunction =>
+ rec(tpe.args.last, args ++ tpe.args.init.map(_.highIfWildcard))
+ case res => Option.when(args.nonEmpty)((args, res.highIfWildcard))
  if uncurryContextFunction then rec(tpe, Seq.empty) else None
 
  val paramNames = declaredType.allParamNames.map(_.toString)

modules/unpickler/src/main/scala/ch/epfl/scala/debugadapter/internal/stacktrace/extensions.scala

@@ -112,7 +112,7 @@ extension (tpe: Type)
 
 extension (tpe: NamedType) def nameStr: String = tpe.name.toString
 
-extension (tpe: TypeOrWildcard)
+extension (tpe: Type)
  def erasedAsReturnType(using Context): ErasedTypeRef = erased(isReturnType = true)
  def erasedAsArgType(asJavaVarargs: Boolean = false)(using Context): ErasedTypeRef =
  tpe match
@@ -121,10 +121,7 @@ extension (tpe: TypeOrWildcard)
  case _ => tpe.erased(isReturnType = false)
 
  private def erased(isReturnType: Boolean)(using Context): ErasedTypeRef =
- val tpe1 = tpe match
- case tpe: Type => tpe
- case _: WildcardTypeArg => ctx.defn.ObjectType
- ErasedTypeRef.erase(tpe1, SourceLanguage.Scala3, keepUnit = isReturnType)
+ ErasedTypeRef.erase(tpe, SourceLanguage.Scala3, keepUnit = isReturnType)
 
 extension (ref: TermRef)
  def isScalaPredef: Boolean =