Rewire `MemberLookup` to return `Option[Entity]`

This allows for the rendering engine to supply the base url for the site
and thus being able to simplify the entity links. They now simply become
`Entity#path + .html` instead of a convoluted rendering in the html
renderers.

1 files changed, 2 insertions, 2 deletions

diff --git a/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala b/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala
index 475157dce..4ddbfd6ab 100644
--- a/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala
+++ b/doc-tool/src/dotty/tools/dottydoc/model/comment/HtmlParsers.scala
@@ -37,7 +37,7 @@ object HtmlParsers {
 
       val linkVisitor = new NodeVisitor(
         new VisitHandler(classOf[Link], new Visitor[Link] with MemberLookup {
-          def queryToUrl(link: String) = lookup(origin, ctx.docbase.packages, link) match {
+          def queryToUrl(title: String, link: String) = makeEntityLink(origin, ctx.docbase.packages, Text(title), link).link match {
             case Tooltip(_) => "#"
             case LinkToExternal(_, url) => url
             case LinkToEntity(t: Entity) => t match {
@@ -49,7 +49,7 @@ object HtmlParsers {
           override def visit(link: Link) = {
             val linkUrl = link.getUrl.toString
             if (!isOuter(linkUrl) && !isRelative(linkUrl))
-              link.setUrl(CharSubSequence.of(queryToUrl(linkUrl)))
+              link.setUrl(CharSubSequence.of(queryToUrl(link.getTitle.toString, linkUrl)))
           }
         })
       )