Fix various small bugs in scaladoc

Author: BarkingBad

docs/docs/usage/scaladoc/site-versioning.md

@@ -33,4 +33,4 @@ doc / scalacOptions ++= Seq("-versions-dictionary-url", "https://dotty.epfl.ch/v
 
 Providing a JSON file via `-versions-dictionary-url` enables scaladoc to link between versions. It is also convenient to be able to change the revision label in the drop-down menu. Everything will change automatically.
 
-![](../../../images/scaladoc/nightly.gif)
+![](images/scaladoc/nightly.gif)

scaladoc/resources/dotty_res/styles/scalastyle.css

@@ -163,7 +163,7 @@ th {
 #logo>span>img {
   max-height: 40px;
   max-width: 40px;
-  padding: 16px 8px 8px 16px;
+  margin: 16px 8px 8px 16px;
   cursor: pointer;
 }
 
@@ -1011,4 +1011,4 @@ footer .socials {
 
 .breadcrumbs a:first-child {
   margin: 0 8px 0 0;
-}
+}

scaladoc/src/dotty/tools/scaladoc/SourceLinks.scala

@@ -37,9 +37,9 @@ case class TemplateSourceLink(val urlTemplate: String) extends SourceLink:
 case class WebBasedSourceLink(prefix: String, revision: String, subPath: String) extends SourceLink:
   override val path: Option[Path] = None
   override def render(memberName: String, path: Path, operation: String, line: Option[Int]): String =
-    val action = if operation == "view" then "blob" else operation
+    val (action, revisionOrMaster) = if operation == "view" then ("blob", revision) else (operation, "master")
     val linePart = line.fold("")(l => s"#L$l")
-    s"$prefix/$action/$revision$subPath/${pathToString(path)}$linePart"
+    s"$prefix/$action/$revisionOrMaster$subPath/${pathToString(path)}$linePart"
 
 class SourceLinkParser(revision: Option[String]) extends ArgParser[SourceLink]:
   val KnownProvider = raw"(\w+):\/\/([^\/#]+)\/([^\/#]+)(\/[^\/#]+)?(#.+)?".r

scaladoc/src/dotty/tools/scaladoc/renderers/Locations.scala

@@ -26,15 +26,14 @@ trait Locations(using ctx: DocContext):
     cache.get(dri) match
       case null =>
         val path = dri match
-          case `docsDRI` => List("docs", "index")
-          case `docsRootDRI` => List("index")
+          case `docsRootDRI` => List("docs", "index")
           case `apiPageDRI` => List("api", "index")
           case dri if dri.isStaticFile =>
             Paths.get(dri.location).iterator.asScala.map(_.toString).toList
           case dri =>
             val loc = dri.location
             val fqn = loc.split(Array('.')).toList match
-              case "<empty>" :: Nil  => "_empty_"   :: Nil
+              case "<empty>" :: Nil  => "_empty_" :: Nil
               case "<empty>" :: tail => "_empty_" :: tail
               case other => other
 

scaladoc/src/dotty/tools/scaladoc/renderers/Writer.scala

@@ -33,4 +33,4 @@ trait Writer(using ctx: DocContext) extends Locations:
 
   def copy(from: InputStream, to: String): String =
     Files.copy(from, dest(to))
-    to
+    to

scaladoc/src/dotty/tools/scaladoc/site/common.scala

@@ -17,8 +17,7 @@ import com.vladsch.flexmark.ext.wikilink.WikiLinkExtension
 
 import scala.collection.JavaConverters._
 
-val docsRootDRI: DRI = DRI(location = "index.md")
-val docsDRI: DRI = DRI(location = "docs/index.md")
+val docsRootDRI: DRI = DRI(location = "docs", symbolUUID = staticFileSymbolUUID)
 val apiPageDRI: DRI = DRI(location = "api")
 
 val defaultMarkdownOptions: DataHolder =

scaladoc/src/dotty/tools/scaladoc/site/templates.scala

@@ -106,4 +106,4 @@ case class TemplateFile(
     layoutTemplate match
       case None => ResolvedPage(code, resources ++ ctx.resources)
       case Some(layoutTemplate) =>
-        layoutTemplate.resolveInner(ctx.nest(code, file, resources))
+        layoutTemplate.resolveInner(ctx.nest(code, file, resources))