aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt1
-rw-r--r--plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt21
-rw-r--r--plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt4
3 files changed, 24 insertions, 2 deletions
diff --git a/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt b/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt
index bcab4e65..c84aef7e 100644
--- a/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt
+++ b/plugins/all-modules-page/src/main/kotlin/MultimodulePageCreator.kt
@@ -51,6 +51,7 @@ class MultimodulePageCreator(
}
header(2, "All modules:")
table(styles = setOf(MultimoduleTable)) {
+ header { group { text("Name") } }
modules.filter { it.name in creationContext.nonEmptyModules }.sortedByDescending { it.name }
.forEach { module ->
val displayedModuleDocumentation = getDisplayedModuleDocumentation(module)
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 55c2837c..07e52851 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -121,7 +121,17 @@ open class DefaultPageCreator(
}
+contentForComments(m)
- block("Packages", 2, ContentKind.Packages, m.packages, m.sourceSets.toSet(), needsAnchors = true) {
+ block(
+ "Packages",
+ 2,
+ ContentKind.Packages,
+ m.packages,
+ m.sourceSets.toSet(),
+ needsAnchors = true,
+ headers = listOf(
+ headers("Name")
+ )
+ ) {
val documentations = it.sourceSets.map { platform ->
it.descriptions[platform]?.also { it.root }
}
@@ -565,7 +575,10 @@ open class DefaultPageCreator(
list,
sourceSets,
needsAnchors = true,
- extra = mainExtra + SimpleAttr.header(name)
+ extra = mainExtra + SimpleAttr.header(name),
+ headers = listOf(
+ headers("Name", "Summary")
+ )
) {
link(it.name, it.dri, kind = ContentKind.Main)
sourceSetDependentHint(it.dri, it.sourceSets.toSet(), kind = ContentKind.SourceSetDependentHint) {
@@ -584,6 +597,10 @@ open class DefaultPageCreator(
if (collection.any()) {
header(2, name, kind = kind)
table(kind, extra = extra, styles = emptySet()) {
+ header {
+ group { text("Name") }
+ group { text("Summary") }
+ }
collection
.groupBy { it.name } // This groupBy should probably use LocationProvider
// This hacks displaying actual typealias signatures along classlike ones
diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
index ba21f089..f98e284f 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt
@@ -146,6 +146,10 @@ open class PageContentBuilder(
}.build()
}
+ internal fun headers(vararg label: String) = contentFor(mainDRI, mainSourcesetData) {
+ label.forEach { text(it) }
+ }
+
fun <T : Documentable> block(
name: String,
level: Int,