Cleanup NameNormalizer

Author: nicolasstucki

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

@@ -5,6 +5,7 @@ import dotty.tools.scaladoc._
 import dotty.tools.scaladoc.{Signature => DSignature}
 
 import SymOps._
+import NameNormalizer._
 
 trait ClassLikeSupport:
   self: TastyParser =>

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

@@ -4,14 +4,13 @@ import dotty.tools.scaladoc._
 import dotty.tools.dotc.core.StdNames.nme.keywords
 import dotty.tools.dotc.core.Names.termName
 
+import scala.quoted._
 import SymOps._
 
-trait NameNormalizer { self: TastyParser =>
-  import qctx.reflect._
+object NameNormalizer {
 
-  private given qctx.type = qctx
-
-  extension (s: Symbol) def normalizedName: String = {
+  extension (using Quotes)(s: quotes.reflect.Symbol) def normalizedName: String = {
+    import quotes.reflect.*
     val withoutGivenPrefix = if s.isGiven then s.name.stripPrefix("given_") else s.name
     val withoutObjectSuffix = if s.flags.is(Flags.Module) then withoutGivenPrefix.stripSuffix("$") else withoutGivenPrefix
     val constructorNormalizedName = if s.isClassConstructor then "this" else withoutObjectSuffix

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

@@ -177,7 +177,7 @@ case class TastyParser(
   isSkipped: qctx.reflect.Symbol => Boolean
 )(
   using val ctx: DocContext
-) extends ScaladocSupport with BasicSupport with TypesSupport with ClassLikeSupport with SyntheticsSupport with PackageSupport with NameNormalizer:
+) extends ScaladocSupport with BasicSupport with TypesSupport with ClassLikeSupport with SyntheticsSupport with PackageSupport:
   import qctx.reflect._
 
   private given qctx.type = qctx

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

@@ -3,6 +3,8 @@ package tasty
 
 import collection.JavaConverters._
 
+import NameNormalizer._
+
 trait TypesSupport:
   self: TastyParser =>
   import qctx.reflect._