Cleanup JavadocAnchorCreator

Author: nicolasstucki

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

@@ -5,33 +5,32 @@ import scala.quoted._
 import dotty.tools.scaladoc.util.Escape._
 import scala.util.matching.Regex
 
-trait JavadocAnchorCreator:
-  self: SymOps[_] =>
+object JavadocAnchorCreator:
 
-  import self.q.reflect._
+  private def javadocPrimitives(using Quotes)(sym: quotes.reflect.Symbol) =
+    import quotes.reflect.*
+    if sym == defn.IntClass then Some("int")
+    else if sym == defn.FloatClass then Some("float")
+    else if sym == defn.DoubleClass then Some("double")
+    else if sym == defn.LongClass then Some("long")
+    else if sym == defn.ByteClass then Some("byte")
+    else if sym == defn.BooleanClass then Some("boolean")
+    else if sym == defn.CharClass then Some("char")
+    else if sym == defn.ShortClass then Some("short")
+    else if sym == defn.ObjectClass then Some("java.lang.Object")
+    else None
 
-  private val javadocPrimitivesMap = Map(
-    defn.IntClass -> "int",
-    defn.FloatClass -> "float",
-    defn.DoubleClass -> "double",
-    defn.LongClass -> "long",
-    defn.ByteClass -> "byte",
-    defn.BooleanClass -> "boolean",
-    defn.CharClass -> "char",
-    defn.ShortClass -> "short",
-    defn.ObjectClass -> "java.lang.Object"
-  )
-
-  private def transformPrimitiveType(tpe: TypeRepr): String = tpe.classSymbol
-    .flatMap(javadocPrimitivesMap.get)
+  private def transformPrimitiveType(using Quotes)(tpe: quotes.reflect.TypeRepr): String = tpe.classSymbol
+    .flatMap(javadocPrimitives)
     .filter(_ => !tpe.typeSymbol.isTypeParam)
     .getOrElse(tpe.show)
 
-  private def transformType(tpe: TypeRepr): String = tpe.simplified match {
-    case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.ArrayClass) => transformType(typeList.head) + ":A"
-    case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.RepeatedParamClass) => transformType(typeList.head) + "..."
-    case AppliedType(tpe, typeList) => transformPrimitiveType(tpe)
-    case other => transformPrimitiveType(other)
-  }
+  private def transformType(using Quotes)(tpe: quotes.reflect.TypeRepr): String =
+    import quotes.reflect.*
+    tpe.simplified match
+      case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.ArrayClass) => transformType(typeList.head) + ":A"
+      case AppliedType(tpe, typeList) if tpe.classSymbol.fold(false)(_ == defn.RepeatedParamClass) => transformType(typeList.head) + "..."
+      case AppliedType(tpe, typeList) => transformPrimitiveType(tpe)
+      case other => transformPrimitiveType(other)
 
-  def getJavadocType(s: TypeRepr) = transformType(s)
+  def getJavadocType(using Quotes)(s: quotes.reflect.TypeRepr) = transformType(s)

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

@@ -6,8 +6,9 @@ import dotty.tools.scaladoc.util.Escape._
 import scala.collection.mutable.{ Map => MMap }
 import dotty.tools.io.AbstractFile
 import Scaladoc2AnchorCreator.getScaladoc2Type
+import JavadocAnchorCreator.getJavadocType
 
-class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator:
+class SymOps[Q <: Quotes](val q: Q):
   import q.reflect._
 
   given q.type = q
@@ -129,7 +130,7 @@ class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator:
         val javadocAnchor = if anchor.isDefined then {
           val paramSigs = sym.paramSymss.flatten.map(_.tree).collect {
             case v: ValDef => v.tpt.tpe
-          }.map(getJavadocType)
+          }.map(getJavadocType(using q))
           "#" + sym.name + paramSigs.mkString("-","-","-")
         } else ""
         docURL + l + extension + javadocAnchor