Better generation of implicit conversions

Author: KacperFKorban

scaladoc/src/dotty/tools/scaladoc/Inkuire.scala

@@ -10,7 +10,7 @@ object Inkuire {
     db = db.copy(
       functions = db.functions.sortBy(_.hashCode),
       types = db.types.toSeq.sortBy(_._1.uuid).toMap,
-      implicitConversions = db.implicitConversions.sortBy(_._1.uuid)
+      implicitConversions = db.implicitConversions.sortBy(_._1.hashCode)
     )
   }
 
@@ -37,7 +37,7 @@ object Inkuire {
   case class InkuireDb(
     functions:           Seq[ExternalSignature],
     types:               Map[ITID, (Type, Seq[Type])],
-    implicitConversions: Seq[(ITID, Type)],
+    implicitConversions: Seq[(TypeLike, Type)],
     typeAliases:         Map[ITID, TypeLike]
   )
 
@@ -163,7 +163,7 @@ object Inkuire {
       )
     }
 
-    private def serializeConversion(conversion: (ITID, Type)): JSON = {
+    private def serializeConversion(conversion: (TypeLike, Type)): JSON = {
       jsonList(
         Seq(
           serialize(conversion._1),

scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala

@@ -138,12 +138,16 @@ trait InkuireSupport:
 
   private def handleImplicitConversion(implicitConversion: Symbol, variableNames: Set[String]) = {
     val defdef = implicitConversion.tree.asInstanceOf[DefDef]
-    val to = defdef.returnTpt.asInkuire(variableNames)
+    val methodVars = defdef.paramss.flatMap(_.params).collect {
+      case TypeDef(name, _) => name
+    }
+    val vars = variableNames ++ methodVars
+    val to = defdef.returnTpt.asInkuire(vars)
     val from = defdef.paramss.flatMap(_.params).collectFirst {
-      case v: ValDef => v.tpt.asInkuire(variableNames)
+      case v: ValDef => v.tpt.asInkuire(vars)
     }
     (from, to) match
-      case (Some(from: Inkuire.Type), to: Inkuire.Type) => Inkuire.db = Inkuire.db.copy(implicitConversions = Inkuire.db.implicitConversions :+ (from.itid.get -> to))
+      case (Some(from), to: Inkuire.Type) => Inkuire.db = Inkuire.db.copy(implicitConversions = Inkuire.db.implicitConversions :+ (from -> to))
       case _ =>
   }