Clenup Scaladoc2AnchorCreator

Author: nicolasstucki

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

@@ -5,17 +5,12 @@ import scala.quoted._
 import dotty.tools.scaladoc.util.Escape._
 import scala.util.matching.Regex
 
-trait Scaladoc2AnchorCreator:
-  self: SymOps[_] =>
+object Scaladoc2AnchorCreator:
 
-  import self.q.reflect._
-
-  implicit private val printer: Printer[Tree] = Printer.TreeShortCode
-
-  def getScaladoc2Type(t: Tree) = {
-    (t match {
-    case d: DefDef => d.show.split("def", 2)(1)
-    case t: TypeDef => t.show.split("type", 2)(1)
-    case v: ValDef => v.show.split("val|var", 2)(1)
-  }).replace(" ","")
-}
+  def getScaladoc2Type(using Quotes)(t: quotes.reflect.Tree) =
+    import quotes.reflect.*
+    val regex = t match
+      case d: DefDef =>  "def"
+      case t: TypeDef => "type"
+      case v: ValDef =>  "val|var"
+    t.show(using Printer.TreeShortCode).split(regex, 2)(1).replace(" ","")

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

@@ -5,11 +5,12 @@ import scala.quoted._
 import dotty.tools.scaladoc.util.Escape._
 import scala.collection.mutable.{ Map => MMap }
 import dotty.tools.io.AbstractFile
+import Scaladoc2AnchorCreator.getScaladoc2Type
 
-class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator with Scaladoc2AnchorCreator:
+class SymOps[Q <: Quotes](val q: Q) extends JavadocAnchorCreator:
   import q.reflect._
 
-  given Q = q
+  given q.type = q
 
   private val externalLinkCache: scala.collection.mutable.Map[AbstractFile, Option[ExternalDocLink]] = MMap()