Update branch

Author: pikinier20

scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompilerDataCollector.scala

@@ -2,13 +2,12 @@ package dotty.tools.scaladoc
 package snippets
 
 import scala.quoted._
-import dotty.tools.scaladoc.tasty.SymOps
+import dotty.tools.scaladoc.tasty.SymOps._
 import dotty.tools.dotc.core._
 
 class SnippetCompilerDataCollector[Q <: Quotes](val qctx: Q):
   import qctx.reflect._
-  object SymOps extends SymOps[qctx.type](qctx)
-  export SymOps._
+  given qctx.type = qctx
 
   def getSnippetCompilerData(sym: Symbol, originalSym: Symbol): SnippetCompilerData =
     val packageName = sym.packageName

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

@@ -39,10 +39,6 @@ trait BasicSupport:
   extension (using Quotes)(sym: reflect.Symbol)
     def documentation = sym.docstring.map(parseComment(_, sym.tree))
 
-    def source =
-      val path = sym.pos.map(_.sourceFile.jpath).filter(_ != null).map(_.toAbsolutePath)
-      path.map(TastyMemberSource(_, sym.pos.get.startLine))
-
     def getAnnotations(): List[Annotation] =
       sym.annotations.filterNot(_.symbol.packageName.startsWith("scala.annotation.internal")).map(parseAnnotation).reverse
 

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

@@ -38,6 +38,11 @@ object SymOps:
         Some(s"${sym.name}-$hash")
       }
       else None
+
+    def source =
+      val path = sym.pos.map(_.sourceFile.jpath).filter(_ != null).map(_.toAbsolutePath)
+      path.map(TastyMemberSource(_, sym.pos.get.startLine))
+
     //TODO: Retrieve string that will match scaladoc anchors
 
 

scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala

@@ -13,7 +13,7 @@ import scala.quoted._
 import dotty.tools.scaladoc.tasty.comments.markdown.ExtendedFencedCodeBlock
 import dotty.tools.scaladoc.tasty.comments.wiki.Paragraph
 import dotty.tools.scaladoc.DocPart
-import dotty.tools.scaladoc.tasty.SymOpsWithLinkCache
+import dotty.tools.scaladoc.tasty.{ SymOpsWithLinkCache, SymOps }
 import collection.JavaConverters._
 import dotty.tools.scaladoc.snippets._
 
@@ -89,6 +89,7 @@ abstract class MarkupConversion[T](val repr: Repr)(using dctx: DocContext) {
 
   object SymOpsWithLinkCache extends SymOpsWithLinkCache
   export SymOpsWithLinkCache._
+  import SymOps._
 
   def resolveLink(queryStr: String): DocLink =
     if SchemeUri.matches(queryStr) then DocLink.ToURL(queryStr)