Address review feedback

Author: romanowski

docs/docs/reference/new-types/polymorphic-function-types.md

@@ -80,7 +80,7 @@ println(e1) // Apply(Apply(Var(wrap),Var(f)),Apply(Var(wrap),Var(a)))
 ### Relationship With Type Lambdas
 
 Polymorphic function types are not to be confused with
-[_type lambdas_](new-types/type-lambdas.md).
+[_type lambdas_](type-lambdas.md).
 While the former describes the _type_ of a polymorphic _value_,
 the latter is an actual function value _at the type level_.
 

scala3doc/src/dotty/dokka/DottyDokkaPlugin.scala

@@ -187,10 +187,6 @@ class DottyDokkaPlugin extends DokkaJavaPlugin:
       .overrideExtension(dokkaBase.getDokkaLocationProvider)
   )
 
-extension (ctx: DokkaContext)
-  def siteContext: Option[StaticSiteContext] = ctx.getConfiguration.asInstanceOf[DocContext].staticSiteContext
-  def args: Scala3doc.Args = ctx.getConfiguration.asInstanceOf[DocContext].args
-
 // TODO (https://github.com/lampepfl/scala3doc/issues/232): remove once problem is fixed in Dokka
 extension [T]  (builder: ExtensionBuilder[T])
   def ordered(before: Seq[Extension[_, _, _]], after: Seq[Extension[_, _, _]]): ExtensionBuilder[T] =

scala3doc/src/dotty/dokka/compat.scala

@@ -11,8 +11,10 @@ import org.jetbrains.dokka.model.properties.ExtraProperty
 // import java.util.Stream // TODO reproduction uncomment
 import java.util.stream.Stream // comment out - wrong error!
 import java.util.stream.Collectors
+import java.util.Collections
 import org.jetbrains.dokka.plugability._
 import kotlin.jvm.JvmClassMappingKt.getKotlinClass
+import org.jetbrains.dokka.links._
 
 val U: kotlin.Unit = kotlin.Unit.INSTANCE
 
@@ -26,15 +28,43 @@ type JMap[K, V] = java.util.Map[K, V]
 type JHashMap[K, V] = java.util.HashMap[K, V]
 type JMapEntry[K, V] = java.util.Map.Entry[K, V]
 
-private val emptyListInst = JList()
+private val emptyListInst = Collections.emptyList
 def JNil[A] = emptyListInst.asInstanceOf[JList[A]]
 
-private val emptyMapInst = JMap()
+private val emptyMapInst = Collections.emptyMap
 def emptyJMap[A, B] = emptyMapInst.asInstanceOf[JMap[A, B]]
 
 type DRI = org.jetbrains.dokka.links.DRI
 val topLevelDri = org.jetbrains.dokka.links.DRI.Companion.getTopLevel
 
+extension (dri: DRI)
+  def withNoOrigin = dri._copy(
+    extra = Option(dri.getExtra).fold(null)(e => raw"\[origin:(.*)\]".r.replaceAllIn(e, ""))
+  )
+
+  def location: String = dri.getPackageName
+
+  def anchor: Option[String] = Option(dri.getClassNames).filterNot(_.isEmpty)
+
+  def extra: String = dri.getExtra
+
+  def target: DriTarget = dri.getTarget
+
+  def _copy(
+    location: String = dri.location,
+    anchor: Option[String] = dri.anchor,
+    target: DriTarget = dri.target,
+    extra: String = dri.extra
+  ) = new DRI(location, anchor.getOrElse(""), null, target, extra)
+
+object DRI:
+  def apply(
+    location: String = "",
+    anchor: Option[String] = None,
+    target: DriTarget = PointingToDeclaration.INSTANCE,
+    extra: String = ""
+  ) = new DRI(location, anchor.getOrElse(""), null, target, extra)
+
 type SourceSetWrapper = DokkaConfiguration$DokkaSourceSet
 type DokkaSourceSet = DokkaConfiguration.DokkaSourceSet
 

scala3doc/src/dotty/dokka/location/ScalaPackageListService.scala

@@ -7,7 +7,7 @@ import org.jetbrains.dokka.links._
 import org.jetbrains.dokka.pages._
 import org.jetbrains.dokka.plugability._
 import collection.JavaConverters._
-import dotty.dokka.model.api.withNoOrigin
+import dotty.dokka.withNoOrigin
 
 object ScalaPackageListService:
   val DOKKA_PARAM_PREFIX = "$dokka"

scala3doc/src/dotty/dokka/model/api/api.scala

@@ -9,7 +9,6 @@ import org.jetbrains.dokka.model.doc._
 import org.jetbrains.dokka.model.properties._
 import org.jetbrains.dokka.pages._
 import dotty.dokka.tasty.comments.Comment
-import org.jetbrains.dokka.links._
 
 enum Visibility(val name: String):
   case Unrestricted extends Visibility("")
@@ -182,34 +181,6 @@ extension (members: Seq[Member]) def byInheritance =
 extension (module: DModule)
   def driMap: Map[DRI, Member] = ModuleExtension.getFrom(module).fold(Map.empty)(_.driMap)
 
-extension (dri: DRI)
-  def withNoOrigin = dri._copy(
-    extra = Option(dri.getExtra).fold(null)(e => raw"\[origin:(.*)\]".r.replaceAllIn(e, ""))
-  )
-
-  def location: String = dri.getPackageName
-
-  def anchor: Option[String] = Option(dri.getClassNames).filterNot(_.isEmpty)
-
-  def extra: String = dri.getExtra
-
-  def target: DriTarget = dri.getTarget
-
-  def _copy(
-    location: String = dri.location,
-    anchor: Option[String] = dri.anchor,
-    target: DriTarget = dri.target,
-    extra: String = dri.extra
-  ) = new DRI(location, anchor.getOrElse(""), null, target, extra)
-
-object DRI:
-  def apply(
-    location: String = "",
-    anchor: Option[String] = None,
-    target: DriTarget = PointingToDeclaration.INSTANCE,
-    extra: String = ""
-  ) = new DRI(location, anchor.getOrElse(""), null, target, extra)
-
 case class TastyDocumentableSource(val path: String, val lineNumber: Int)
 
 type DocPart = DocTag

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

@@ -17,8 +17,7 @@ import org.jetbrains.dokka.plugability.DokkaContext
 import org.jetbrains.dokka.pages.Style
 import org.jetbrains.dokka.model.DisplaySourceSet
 import util.Try
-
-import scala.collection.JavaConverters._
+import collection.JavaConverters._
 
 import dotty.dokka.model.api._
 
@@ -168,7 +167,8 @@ class StaticSiteContext(
     }.toOption
     pathsDri.getOrElse(memberLinkResolver(link).toList)
 
-  def driFor(dest: Path): DRI = DRI(location = s"_.${root.toPath.relativize(dest)}")
+  def driFor(dest: Path): DRI =
+    DRI(location = root.toPath.relativize(dest).iterator.asScala.mkString("."))
 
   def relativePath(myTemplate: LoadedTemplate) = root.toPath.relativize(myTemplate.file.toPath)
 

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

@@ -23,8 +23,8 @@ import org.jetbrains.dokka.pages._
 
 import scala.collection.JavaConverters._
 
-val docsRootDRI: DRI = DRI(location = "_.index.md")
-val docsDRI: DRI = DRI(location = "_.docs/index.md")
+val docsRootDRI: DRI = DRI(location = "index.md")
+val docsDRI: DRI = DRI(location = "docs.index.md")
 val apiPageDRI: DRI = DRI(location = "api", extra = "__api__")
 
 val defaultMarkdownOptions: DataHolder =

scala3doc/src/dotty/dokka/tasty/ClassLikeSupport.scala

@@ -27,32 +27,32 @@ trait ClassLikeSupport:
         else Kind.Class(Nil, Nil)
 
   private def kindForClasslike(classDef: ClassDef): Kind =
-        def typeArgs = classDef.getTypeParams.map(mkTypeArgument)
-
-        def parameterModifier(parameter: Symbol): String =
-          val fieldSymbol = classDef.symbol.declaredField(parameter.normalizedName)
-          def isVal = fieldSymbol.flags.is(Flags.ParamAccessor) &&
-            !classDef.symbol.flags.is(Flags.Case) &&
-            !fieldSymbol.flags.is(Flags.Private)
-
-          if fieldSymbol.flags.is(Flags.Mutable) then "var "
-          else if isVal then "val "
-          else ""
-
-        def args = if constructorWithoutParamLists(classDef) then Nil else
-          val constr =
-            Some(classDef.constructor.symbol)
-              .filter(s => s.exists && !s.isHiddenByVisibility)
-              .map( _.tree.asInstanceOf[DefDef])
-          constr.fold(Nil)(
-            _.paramss.map(_.map(mkParameter(_, parameterModifier)))
-            )
+    def typeArgs = classDef.getTypeParams.map(mkTypeArgument)
+
+    def parameterModifier(parameter: Symbol): String =
+      val fieldSymbol = classDef.symbol.declaredField(parameter.normalizedName)
+      def isVal = fieldSymbol.flags.is(Flags.ParamAccessor) &&
+        !classDef.symbol.flags.is(Flags.Case) &&
+        !fieldSymbol.flags.is(Flags.Private)
+
+      if fieldSymbol.flags.is(Flags.Mutable) then "var "
+      else if isVal then "val "
+      else ""
+
+    def args = if constructorWithoutParamLists(classDef) then Nil else
+      val constr =
+        Some(classDef.constructor.symbol)
+          .filter(s => s.exists && !s.isHiddenByVisibility)
+          .map( _.tree.asInstanceOf[DefDef])
+      constr.fold(Nil)(
+        _.paramss.map(_.map(mkParameter(_, parameterModifier)))
+        )
 
-        if classDef.symbol.flags.is(Flags.Module) then Kind.Object
-        else if classDef.symbol.flags.is(Flags.Trait) then
-          Kind.Trait(typeArgs, args)
-        else if classDef.symbol.flags.is(Flags.Enum) then Kind.Enum
-        else Kind.Class(typeArgs, args)
+    if classDef.symbol.flags.is(Flags.Module) then Kind.Object
+    else if classDef.symbol.flags.is(Flags.Trait) then
+      Kind.Trait(typeArgs, args)
+    else if classDef.symbol.flags.is(Flags.Enum) then Kind.Enum
+    else Kind.Class(typeArgs, args)
 
   def mkClass[T >: DClass](classDef: ClassDef)(
     dri: DRI = classDef.symbol.dri,

scala3doc/src/dotty/dokka/translators/ScalaPageCreator.scala

@@ -50,8 +50,6 @@ class ScalaPageCreator(
       JNil
     )
 
-  override def pageForClasslike(c: DClasslike): ClasslikePageNode = ???
-
   def pageForMember(c: Member): ClasslikePageNode = {
     val name =
       if c.kind == Kind.Object && c.companion.isDefined then