Render absolute paths for images in static sites

Author: romanowski

scala3doc/src/dotty/dokka/site/PartiallyRenderedContent.scala

@@ -8,6 +8,8 @@ import org.jetbrains.dokka.base.resolvers.local.LocationProvider
 import com.vladsch.flexmark.convert.html.FlexmarkHtmlParser
 import org.jsoup.Jsoup
 import scala.collection.JavaConverters._
+import scala.util.Try
+import java.net.URL
 
 case class PartiallyRenderedContent(
   template: LoadedTemplate,
@@ -28,7 +30,13 @@ case class PartiallyRenderedContent(
 
   lazy val resolved = template.resolveToHtml(context)
 
-  def procsesHtml(linkTo: String => String): String =
+  def procsesHtml(linkTo: String => String, absoluteResource: String => String): String =
     val document = Jsoup.parse(resolved.code)
-    document.select("a").forEach(element => element.attr("href", linkTo(element.attr("href"))))// forrach does not work here
+    document.select("a").forEach(element => element.attr("href", linkTo(element.attr("href"))))
+    document.select("img").forEach { element =>
+      val link = element.attr("src")
+      Try(new URL(link)).getOrElse {
+        if(link.startsWith("/")) element.attr("src", absoluteResource(link.drop(1)))
+      }
+    }// forrach does not work here
     document.outerHtml()

scala3doc/src/dotty/renderers/ScalaHtmlRenderer.scala

@@ -253,31 +253,15 @@ class ScalaHtmlRenderer(ctx: DokkaContext) extends HtmlRenderer(ctx) {
     page.getContent match
       case prc: PartiallyRenderedContent =>
         def processLocalLink(str: String): String =
+          Try(URL(str)).map(_ => str).getOrElse{
           // TODO (https://github.com/lampepfl/scala3doc/issues/238) error handling
-          prc.context.driForLink(prc.template.templateFile, str).toOption
-            .flatMap(dri => Option(getLocationProvider.resolve(dri, sourceSets, page)))
-            .getOrElse(str)
-
-        val childrenContent = page.getChildren.asScala.collect {
-          case p: StaticPageNode => p.getContent.asInstanceOf[PartiallyRenderedContent]//.resolved.code
-        }
-
-        val html = prc.procsesHtml(url => Try(URL(url)).fold(_ => processLocalLink(url), _ => url))
-        val htmlAst = Jsoup.parse(html)
-
-        // childrenContent.foreach { c =>
-        //   val code = Jsoup.parse(c.resolved.code)
-        //   val brief = code.select("p").first()
-        //   try {
-        //     val li = htmlAst.select(s"li:contains(${c.template.title})")
-        //     val div = li.select(s"div.excerpt")
-        //     div.html(brief.toString)
-        //   } catch {
-        //     _ =>
-        //   }
-        // }
-
-        withHtml(context, htmlAst.toString)
+            prc.context.driForLink(prc.template.templateFile, str).toOption
+              .flatMap(dri => Option(getLocationProvider.resolve(dri, sourceSets, page)))
+              .getOrElse(str)
+          }
+
+        val html = prc.procsesHtml(processLocalLink, resolveLink(page))
+        withHtml(context, html)
       case content =>
         build(content, context, page, /*sourceSetRestriction=*/null)
 
@@ -335,20 +319,20 @@ class ScalaHtmlRenderer(ctx: DokkaContext) extends HtmlRenderer(ctx) {
   private def resolveRoot(page: PageNode, path: String) =
     getLocationProvider.pathToRoot(page) + path
 
+  private def resolveLink(page: PageNode)(url: String): String =
+    if URI(url).isAbsolute then url else resolveRoot(page, url)
+
   private def linkResources(page: PageNode, resources: Iterable[String]): Iterable[AppliedTag] =
     def fileExtension(url: String): String =
       val param = url.indexOf('?')
       val end = if param < 0 then url.length else param
       val point = url.lastIndexOf('.', end)
       url.substring(point+1, end)
 
-    def resolveLink(url: String): String =
-      if URI(url).isAbsolute then url else resolveRoot(page, url)
-
     for res <- resources yield
       fileExtension(res) match
-        case "css" => link(rel := "stylesheet", href := resolveLink(res))
-        case "js" => script(`type` := "text/javascript", src := resolveLink(res), defer := "true")
+        case "css" => link(rel := "stylesheet", href := resolveLink(page)(res))
+        case "js" => script(`type` := "text/javascript", src := resolveLink(page)(res), defer := "true")
         case _ => raw(res)
 
   private def buildWithKotlinx(node: ContentNode, pageContext: ContentPage, sourceSetRestriction: JSet[DisplaySourceSet]): String =