Simplify tryHeal signature

Author: nicolasstucki

compiler/src/dotty/tools/dotc/staging/CrossStageSafety.scala

@@ -206,8 +206,8 @@ class CrossStageSafety extends TreeMapWithStages {
    *  The tag is generated by an instance of `QuoteTypeTags` directly if the splice is explicit
    *  or indirectly by `tryHeal`.
    */
-  protected def healType(pos: SrcPos)(using Context) =
-    new HealType(pos)
+  protected def healType(pos: SrcPos)(tpe: Type)(using Context) =
+    new HealType(pos).apply(tpe)
 
   /** Check level consistency of terms references */
   private def checkLevelConsistency(tree: Ident | This)(using Context): Unit =

compiler/src/dotty/tools/dotc/staging/HealType.scala

@@ -51,7 +51,7 @@ class HealType(pos: SrcPos)(using Context) extends TypeMap {
         if level == 0 then tp else getQuoteTypeTags.getTagRef(prefix)
       case _: NamedType | _: ThisType | NoPrefix =>
         if levelInconsistentRootOfPath(tp).exists then
-          tryHeal(tp.symbol, tp, pos)
+          tryHeal(tp)
         else
           tp
       case _ =>
@@ -82,7 +82,7 @@ class HealType(pos: SrcPos)(using Context) extends TypeMap {
    *  reference to a type alias containing the equivalent of `${summon[quoted.Type[T]]}`.
    *  Emits an error if `T` cannot be healed and returns `T`.
    */
-  protected def tryHeal(sym: Symbol, tp: TypeRef, pos: SrcPos): Type = {
+  protected def tryHeal(tp: TypeRef): Type = {
     val reqType = defn.QuotedTypeClass.typeRef.appliedTo(tp)
     val tag = ctx.typer.inferImplicitArg(reqType, pos.span)
     tag.tpe match

compiler/src/dotty/tools/dotc/transform/Staging.scala

@@ -36,8 +36,9 @@ class Staging extends MacroTransform {
       tree match {
         case PackageDef(pid, _) if tree.symbol.owner == defn.RootClass =>
           val checker = new CrossStageSafety {
-            override protected def healType(pos: SrcPos)(using Context) = new HealType(pos) {
-              override protected def tryHeal(sym: Symbol, tp: TypeRef, pos: SrcPos): TypeRef = {
+            override protected def healType(pos: SrcPos)(tpe: Type)(using Context) = new HealType(pos) {
+              override protected def tryHeal(tp: TypeRef): TypeRef = {
+                val sym = tp.symbol
                 def symStr =
                   if (sym.is(ModuleClass)) sym.sourceModule.show
                   else i"${sym.name}.this"
@@ -51,7 +52,7 @@ class Staging extends MacroTransform {
 
                 tp
               }
-            }
+            }.apply(tpe)
           }
           checker.transform(tree)
         case _ =>