Fix whitespaces in newly added files

Author: romanowski

project/Build.scala

@@ -1465,7 +1465,7 @@ object Build {
 
       def joinProducts(products: Seq[java.io.File]): String =
         products.iterator.map(_.getAbsolutePath.toString).mkString(java.io.File.pathSeparator)
-      
+
       val dokkaVersion = "1.4.10.2"
 
       project.settings(commonBootstrappedSettings).

scala3doc/src/dotty/dokka/DottyDokkaPlugin.scala

@@ -149,7 +149,7 @@ class DottyDokkaPlugin extends DokkaJavaPlugin:
           dokkaBase.getNavigationPageInstaller,
           dokkaBase.getScriptsInstaller,
           dokkaBase.getStylesInstaller,
-          dokkaBase.getPackageListCreator,  
+          dokkaBase.getPackageListCreator,
         ),
         after = Seq(dokkaBase.getRootCreator)
       )
@@ -184,7 +184,7 @@ class DottyDokkaPlugin extends DokkaJavaPlugin:
   )
 
   extension (ctx: DokkaContext):
-    def siteContext: Option[StaticSiteContext] = ctx.getConfiguration match 
+    def siteContext: Option[StaticSiteContext] = ctx.getConfiguration match
       case d: DottyDokkaConfig => d.staticSiteContext
       case _ => None
 
@@ -194,7 +194,7 @@ extension [T]  (builder: ExtensionBuilder[T]):
     val byDsl = new OrderingKind.ByDsl(dsl => {
       dsl.after(after:_*)
       dsl.before(before:_*)
-      kotlin.Unit.INSTANCE // TODO why U does not work here? 
+      kotlin.Unit.INSTANCE // TODO why U does not work here?
     })
     // Does not compile but compiles in scala 2
     // ExtensionBuilder.copy$default(builder, null, null, null, byDsl, null, null, 55, null)
@@ -206,5 +206,5 @@ extension [T]  (builder: ExtensionBuilder[T]):
 
 
   def before(exts: Extension[_, _, _]*):  ExtensionBuilder[T] = ordered(exts, Nil)
-    
+
   def after(exts: Extension[_, _, _]*):  ExtensionBuilder[T] = ordered(Nil, exts)

scala3doc/src/dotty/dokka/compat.scala

@@ -36,15 +36,15 @@ extension [T] (wrapper: DokkaSourceSet):
     // when named `toSet` fails in runtime -- TODO: create a minimal!
     // def toSet: JSet[DokkaConfiguration$DokkaSourceSet] = JSet(wrapper.asInstanceOf[SourceSetWrapper])
     def asSet: JSet[DokkaConfiguration$DokkaSourceSet] = JSet(wrapper.asInstanceOf[SourceSetWrapper])
-    def asMap(value: T): JMap[DokkaConfiguration$DokkaSourceSet, T] = JMap(wrapper.asInstanceOf[SourceSetWrapper] -> value)    
+    def asMap(value: T): JMap[DokkaConfiguration$DokkaSourceSet, T] = JMap(wrapper.asInstanceOf[SourceSetWrapper] -> value)
 
 extension (sourceSets: JList[DokkaSourceSet]):
   def asDokka: JSet[SourceSetWrapper] = sourceSets.asScala.toSet.asJava.asInstanceOf[JSet[SourceSetWrapper]]
-  def toDisplaySourceSet = sourceSets.asScala.map(ss => DisplaySourceSet(ss.asInstanceOf[SourceSetWrapper])).toSet.asJava 
+  def toDisplaySourceSet = sourceSets.asScala.map(ss => DisplaySourceSet(ss.asInstanceOf[SourceSetWrapper])).toSet.asJava
 
 extension (sourceSets: Set[SourceSetWrapper]):
-  def toDisplay = sourceSets.map(DisplaySourceSet(_)).asJava    
-  
+  def toDisplay = sourceSets.map(DisplaySourceSet(_)).asJava
+
 extension [V] (a: WithExtraProperties[_]):
   def get(key: ExtraProperty.Key[_, V]): V = a.getExtra().getMap().get(key).asInstanceOf[V]
 
@@ -55,5 +55,5 @@ extension [V] (map: JMap[SourceSetWrapper, V]):
   def defaultValue: V = map.values.asScala.head
 
 extension [V](jlist: JList[V]):
-  def ++ (other: JList[V]): JList[V] = 
+  def ++ (other: JList[V]): JList[V] =
     Stream.of(jlist, other).flatMap(_.stream).collect(Collectors.toList())

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

@@ -6,20 +6,20 @@ import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.pages.{ContentNode, DCI, Style}
 
 case class PartiallyRenderedContent(
-    template: TemplateFile,
-    context: StaticSiteContext,
-    override val getChildren: JList[ContentNode],
-    override val getDci: DCI,
-    override val getSourceSets: JSet[DisplaySourceSet],
-    override val getStyle: JSet[Style] = JSet(),
-    override val getExtra: PropertyContainer[ContentNode] = new PropertyContainer(JMap())
+  template: TemplateFile,
+  context: StaticSiteContext,
+  override val getChildren: JList[ContentNode],
+  override val getDci: DCI,
+  override val getSourceSets: JSet[DisplaySourceSet],
+  override val getStyle: JSet[Style] = JSet(),
+  override val getExtra: PropertyContainer[ContentNode] = new PropertyContainer(JMap())
 ) extends ContentNode:
-    override def hasAnyContent(): Boolean = true
+  override def hasAnyContent(): Boolean = true
 
-    override def withNewExtras(newExtras: PropertyContainer[ContentNode]): ContentNode =
-        copy(getExtra = newExtras)
+  override def withNewExtras(newExtras: PropertyContainer[ContentNode]): ContentNode =
+    copy(getExtra = newExtras)
 
-    override def withSourceSets(sourceSets: JSet[DisplaySourceSet]): ContentNode =
-        copy(getSourceSets = sourceSets)
+  override def withSourceSets(sourceSets: JSet[DisplaySourceSet]): ContentNode =
+    copy(getSourceSets = sourceSets)
 
-    lazy val resolved = template.resolveToHtml(context)
+  lazy val resolved = template.resolveToHtml(context)

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

@@ -11,8 +11,8 @@ import org.jetbrains.dokka.pages._
 import org.jetbrains.dokka.transformers.pages.PageTransformer
 
 case class LoadedTemplate(templateFile: TemplateFile, children: List[LoadedTemplate], file: File) {
-    def relativePath(root: File): String =
-        root.toPath().relativize(file.toPath()).toString().replace(File.separatorChar, '.')
+  def relativePath(root: File): String =
+    root.toPath().relativize(file.toPath()).toString().replace(File.separatorChar, '.')
 }
 
 case class StaticPageNode(
@@ -23,17 +23,22 @@ case class StaticPageNode(
                            override val getEmbeddedResources: JList[String],
                            override val getChildren: JList[PageNode],
                          ) extends ContentPage:
-    override def getDocumentable: Documentable = null
+  override def getDocumentable: Documentable = null
 
-    def title(): String = template.title()
-    def hasFrame(): Boolean = template.hasFrame()
+  def title(): String = template.title()
+  def hasFrame(): Boolean = template.hasFrame()
 
-    override def modified(name: String, content: ContentNode, dri: JSet[DRI], embeddedResources: JList[String], children: JList[_ <: PageNode]): ContentPage =
-        copy(template, name, content, dri, embeddedResources, children.asInstanceOf[JList[PageNode]])
+  override def modified(
+    name: String,
+    content: ContentNode,
+    dri: JSet[DRI],
+    embeddedResources: JList[String],
+    children: JList[_ <: PageNode]): ContentPage =
+      copy(template, name, content, dri, embeddedResources, children.asInstanceOf[JList[PageNode]])
 
-    override def modified(name: String, children: JList[_ <: PageNode]): PageNode =
-        copy(getName = name, getChildren = children.asInstanceOf[JList[PageNode]])
+  override def modified(name: String, children: JList[_ <: PageNode]): PageNode =
+    copy(getName = name, getChildren = children.asInstanceOf[JList[PageNode]])
 
-    def resources(): List[String] = getContent match 
-        case p: PartiallyRenderedContent => p.resolved.resources
-        case _ => Nil
+  def resources(): List[String] = getContent match
+    case p: PartiallyRenderedContent => p.resolved.resources
+    case _ => Nil

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

@@ -17,85 +17,82 @@ import org.jetbrains.dokka.model.DisplaySourceSet
 import scala.collection.JavaConverters._
 
 class StaticSiteContext(val root: File, sourceSets: Set[SourceSetWrapper]):
-    val docsFile = new File(root, "docs")
-
-    def indexPage():Option[StaticPageNode] = 
-      val files = List(new File(root, "index.html"), new File(root, "index.md")).filter { _.exists() }
-      if (files.size > 1) println(s"ERROR: Multiple root index pages found: ${files.map(_.getAbsolutePath)}") // TODO (#14): provide proper error handling
-      loadFiles(files).headOption
-
-    lazy val layouts: Map[String, TemplateFile] =
-      val layoutRoot = new File(root, "_layouts")
-      val dirs: Array[File] = Option(layoutRoot.listFiles()).getOrElse(Array())
-      dirs.map { it => loadTemplateFile(it) }.map { it => it.name() -> it }.toMap
-
-    private def isValidTemplate(file: File): Boolean =
-      (file.isDirectory && !file.getName.startsWith("_")) ||
-        file.getName.endsWith(".md") ||
-        file.getName.endsWith(".html")
-
-
-    private def loadTemplate(from: File): Option[LoadedTemplate] =
-      if (!isValidTemplate(from)) None else 
-        try
-          val (indexes, children) = Option(from.listFiles()).toSeq.flatten.flatMap(loadTemplate).partition(_.templateFile.isIndexPage())
-          if (indexes.size > 1)
-              println(s"ERROR: Multiple index pages for $from found in ${indexes.map(_.file)}") // TODO (#14): provide proper error handling
-
-          def loadIndexPage(): TemplateFile = {
-              val indexFiles = from.listFiles { file =>file.getName == "index.md" || file.getName == "index.html" }
-              indexFiles.size match {
-                  case 0 => emptyTemplate(from)
-                  case 1 => loadTemplateFile(indexFiles.head).copy(file = from)
-                  case _ =>  throw new java.lang.RuntimeException(s"ERROR: Multiple index pages found under ${from.toPath}")
-              }
-          }
-
-          val templateFile = if (from.isDirectory) loadIndexPage() else loadTemplateFile(from)
-
-          Some(LoadedTemplate(templateFile, children.toList, from))
-        catch
+  val docsFile = new File(root, "docs")
+
+  def indexPage():Option[StaticPageNode] =
+    val files = List(new File(root, "index.html"), new File(root, "index.md")).filter { _.exists() }
+    if (files.size > 1) println(s"ERROR: Multiple root index pages found: ${files.map(_.getAbsolutePath)}") // TODO (#14): provide proper error handling
+    loadFiles(files).headOption
+
+  lazy val layouts: Map[String, TemplateFile] =
+    val layoutRoot = new File(root, "_layouts")
+    val dirs: Array[File] = Option(layoutRoot.listFiles()).getOrElse(Array())
+    dirs.map { it => loadTemplateFile(it) }.map { it => it.name() -> it }.toMap
+
+  private def isValidTemplate(file: File): Boolean =
+    (file.isDirectory && !file.getName.startsWith("_")) ||
+      file.getName.endsWith(".md") ||
+      file.getName.endsWith(".html")
+
+
+  private def loadTemplate(from: File): Option[LoadedTemplate] =
+    if (!isValidTemplate(from)) None else
+      try
+        val (indexes, children) = Option(from.listFiles()).toSeq.flatten.flatMap(loadTemplate).partition(_.templateFile.isIndexPage())
+        if (indexes.size > 1)
+          println(s"ERROR: Multiple index pages for $from found in ${indexes.map(_.file)}") // TODO (#14): provide proper error handling
+
+        def loadIndexPage(): TemplateFile =
+          val indexFiles = from.listFiles { file =>file.getName == "index.md" || file.getName == "index.html" }
+          indexFiles.size match
+            case 0 => emptyTemplate(from)
+            case 1 => loadTemplateFile(indexFiles.head).copy(file = from)
+            case _ =>
+              val msg = s"ERROR: Multiple index pages found under ${from.toPath}"
+              throw new java.lang.RuntimeException(msg)
+
+        val templateFile = if (from.isDirectory) loadIndexPage() else loadTemplateFile(from)
+
+        Some(LoadedTemplate(templateFile, children.toList, from))
+      catch
           case e: RuntimeException =>
             e.printStackTrace() // TODO (#14): provide proper error handling
             None
 
-    def asContent(d: DocTag, dri: DRI) = new DocTagToContentConverter().buildContent(
-        d,
+  def asContent(doctag: DocTag, dri: DRI) = new DocTagToContentConverter().buildContent(
+    doctag,
+    new DCI(Set(dri).asJava, ContentKind.Empty),
+    sourceSets.asJava,
+    JSet(),
+    new PropertyContainer(JMap())
+  )
+
+  def loadFiles(files: List[File], customChildren: List[PageNode] = Nil): List[StaticPageNode] =
+    val all = files.flatMap(loadTemplate)
+    def flatten(it: LoadedTemplate): List[String] =
+      List(it.relativePath(root)) ++ it.children.flatMap(flatten)
+
+    def pathToDRI(path: String) = mkDRI(s"_.$path")
+
+    val driMap = all.flatMap(flatten).map(it => it -> pathToDRI(it)).toMap
+
+    def templateToPage(myTemplate: LoadedTemplate): StaticPageNode =
+      val dri = pathToDRI(myTemplate.relativePath(root))
+      val content = new PartiallyRenderedContent(
+        myTemplate.templateFile,
+        this,
+        JList(),
         new DCI(Set(dri).asJava, ContentKind.Empty),
-        sourceSets.asJava,
-        JSet(),
-        new PropertyContainer(JMap())
-    )
-
-    def loadFiles(
-        files: List[File],
-        customChildren: List[PageNode] = Nil
-    ): List[StaticPageNode] =
-      val all = files.flatMap(loadTemplate)
-      def flatten(it: LoadedTemplate): List[String] =
-        List(it.relativePath(root)) ++ it.children.flatMap(flatten)
-
-      def pathToDRI(path: String) = mkDRI(s"_.$path")
-
-      val driMap = all.flatMap { it => flatten(it) }.map { it =>  it -> pathToDRI(it) }.toMap
-
-      def templateToPage(myTemplate: LoadedTemplate): StaticPageNode = 
-        val dri = pathToDRI(myTemplate.relativePath(root))
-        val content = new PartiallyRenderedContent(
-          myTemplate.templateFile,
-          this,
-          JList(),
-          new DCI(Set(dri).asJava, ContentKind.Empty),
-          sourceSets.toDisplay,
-          JSet()
-        )
-        StaticPageNode(
-          myTemplate.templateFile,
-          myTemplate.templateFile.title(),
-          content,
-          JSet(dri),
-          JList(),
-          (myTemplate.children.map(templateToPage) ++ customChildren).asJava
-        )
-
-      all.map(templateToPage)
+        sourceSets.toDisplay,
+        JSet()
+      )
+      StaticPageNode(
+        myTemplate.templateFile,
+        myTemplate.templateFile.title(),
+        content,
+        JSet(dri),
+        JList(),
+        (myTemplate.children.map(templateToPage) ++ customChildren).asJava
+      )
+
+    all.map(templateToPage)

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

@@ -12,13 +12,13 @@ import org.jetbrains.dokka.plugability.DokkaContext
 import scala.collection.JavaConverters._
 
 class StaticSiteLocationProviderFactory(private val ctx: DokkaContext) extends LocationProviderFactory:
-    override def getLocationProvider(pageNode: RootPageNode): LocationProvider =
-      new StaticSiteLocationProvider(ctx, pageNode)
+  override def getLocationProvider(pageNode: RootPageNode): LocationProvider =
+    new StaticSiteLocationProvider(ctx, pageNode)
 
-class StaticSiteLocationProvider(ctx: DokkaContext, pageNode: RootPageNode) 
+class StaticSiteLocationProvider(ctx: DokkaContext, pageNode: RootPageNode)
   extends DokkaLocationProvider(pageNode, ctx, ".html"):
     private def updatePageEntry(page: PageNode, jpath: JList[String]): JList[String] =
-      page match 
+      page match
         case page: StaticPageNode =>
           if (page.getDri.contains(docsRootDRI)) JList("index")
           else {