Merge "Add Kotlin objects as-Java to toc"
diff --git a/src/main/java/com/google/devsite/renderer/converters/PackageDocumentableConverter.kt b/src/main/java/com/google/devsite/renderer/converters/PackageDocumentableConverter.kt
index 6623955..ce861e2 100644
--- a/src/main/java/com/google/devsite/renderer/converters/PackageDocumentableConverter.kt
+++ b/src/main/java/com/google/devsite/renderer/converters/PackageDocumentableConverter.kt
@@ -76,11 +76,7 @@
docsToSummary(docsHolder.classesFor(dPackage, displayLanguage))
}
val enums = async { docsToSummary(docsHolder.enumsFor(dPackage)) }
- val objects = async {
- docsToSummary(
- docsHolder.interestingObjectsFor(dPackage, displayLanguage)
- )
- }
+ val objects = async { docsToSummary(docsHolder.interestingObjectsFor(dPackage)) }
val exceptions = async {
docsToSummary(docsHolder.exceptionsFor(dPackage))
}
diff --git a/src/main/java/com/google/devsite/renderer/converters/RootDocumentableConverter.kt b/src/main/java/com/google/devsite/renderer/converters/RootDocumentableConverter.kt
index bb8deef..8b6ad1b 100644
--- a/src/main/java/com/google/devsite/renderer/converters/RootDocumentableConverter.kt
+++ b/src/main/java/com/google/devsite/renderer/converters/RootDocumentableConverter.kt
@@ -138,11 +138,11 @@
packagePrefixToRemove: String?
): Deferred<DefaultTocPackage> = async {
val interfaces = docsHolder.interfacesFor(dPackage).map(::typeForToc)
+ val objects = docsHolder.interestingObjectsFor(dPackage).map(::typeForToc)
val classes = docsHolder.classesFor(dPackage, displayLanguage).map(::typeForToc)
val enums = docsHolder.enumsFor(dPackage).map(::typeForToc)
val exceptions = docsHolder.exceptionsFor(dPackage).map(::typeForToc)
val annotations = docsHolder.annotationsFor(dPackage).map(::typeForToc)
- val objects = docsHolder.interestingObjectsFor(dPackage, displayLanguage).map(::typeForToc)
// Update the string to trim to end with a `.` if it doesn't already.
val prefixToTrim = (packagePrefixToRemove?.removeSuffix(".")?.plus(".")) ?: ""
@@ -152,11 +152,12 @@
name = dPackage.name.removePrefix(prefixToTrim),
packageUrl = pathProvider.forReference(dPackage.dri).url,
interfaces = interfaces,
- classes = classes,
+ classes = if (displayLanguage == Language.KOTLIN) classes
+ else (classes + objects).sortedBy { it.name },
enums = enums,
exceptions = exceptions,
annotations = annotations,
- objects = objects
+ objects = if (displayLanguage == Language.KOTLIN) objects else emptyList()
) // Typealiases do not appear in the toc because they do not get their own pages
)
}
diff --git a/src/main/java/com/google/devsite/renderer/impl/DocumentablesHolder.kt b/src/main/java/com/google/devsite/renderer/impl/DocumentablesHolder.kt
index ff7d30e..507acce 100644
--- a/src/main/java/com/google/devsite/renderer/impl/DocumentablesHolder.kt
+++ b/src/main/java/com/google/devsite/renderer/impl/DocumentablesHolder.kt
@@ -120,6 +120,15 @@
scope.apply {
for (dPackage in module.packages) {
val children = async { dPackage.explodedChildren }
+ val companionsMap = async {
+ computeCompanions(children.await().filterIsInstance<WithCompanion>())
+ }
+ val interestingKotlinObjectsList = async {
+ computeInterestingObjectsForKotlin(
+ children.await().filterIsInstance<DObject>(),
+ companionsMap.await().keys
+ )
+ }
val syntheticClassList = async { computeSyntheticClasses(dPackage) }
val combinedClasslikesList = async {
computeClasslikes(
@@ -135,10 +144,6 @@
val annotationList = async { computeAnnotations(children.await()) }
val typeAliasList = async { computeTypesAliases(dPackage) }
val exceptionList = async { computeExceptions(children.await()) }
- val companionsMap = async { computeCompanions(children.await()) }
- val interestingKotlinObjectsList = async {
- computeInterestingObjectsForKotlin(children.await(), companionsMap.await().keys)
- }
classlikes[dPackage.dri] = combinedClasslikesList
classes[dPackage.dri] = classList
@@ -242,13 +247,8 @@
suspend fun exceptionsFor(dPackage: DPackage): List<DClass> =
exceptions.getValue(dPackage.dri).await()
- suspend fun interestingObjectsFor(dPackage: DPackage, displayLanguage: Language) =
- if (displayLanguage == Language.JAVA) {
- // TODO(b/203678085): Objects are instead converted to top-level static inner classes
- emptyList()
- } else {
- interestingKotlinObjects.getValue(dPackage.dri).await()
- }
+ suspend fun interestingObjectsFor(dPackage: DPackage) =
+ interestingKotlinObjects.getValue(dPackage.dri).await()
/**
* Iterate through the all packages and create map of each class to its associated
@@ -360,7 +360,8 @@
/** Computes the syntheticClasses from top level functions that are used to document Kotlin as
* Java
*/
- internal fun computeSyntheticClasses(dPackage: DPackage): Set<DClass> {
+ internal fun computeSyntheticClasses(dPackage: DPackage):
+ Set<DClass> {
// functions that are JvmSynthetic are not accessible from Java, so they should not appear
// in the documentation
val javaFunctions = dPackage.functions.filterOutJvmSynthetic()
@@ -425,13 +426,14 @@
}
/** Returns a Map<DRI, DObject> because `Set<Documentable>.contains` is unusable b/232944038. */
- private fun computeCompanions(docs: List<Documentable>) =
- docs.filterIsInstance<WithCompanion>().mapNotNull { it.companion }.associateBy { it.dri }
+ private fun computeCompanions(docs: List<WithCompanion>) =
+ docs.mapNotNull { it.companion }.associateBy { it.dri }
/** Computes the list of objects that are interesting in Kotlin */
- private fun computeInterestingObjectsForKotlin(docs: List<Documentable>, companions: Set<DRI>):
- List<DObject> {
- val allObjects = docs.filterIsInstance<DObject>()
+ private fun computeInterestingObjectsForKotlin(
+ allObjects: List<DObject>,
+ companions: Set<DRI>
+ ): List<DObject> {
// Un-ordinary companions are companions, but also appear in the ToC.
val (boringObjects, interestingObjects) =
diff --git a/src/test/java/com/google/devsite/renderer/converters/RootDocumentableConverterTest.kt b/src/test/java/com/google/devsite/renderer/converters/RootDocumentableConverterTest.kt
index 0b8ea66..d84cbc5 100644
--- a/src/test/java/com/google/devsite/renderer/converters/RootDocumentableConverterTest.kt
+++ b/src/test/java/com/google/devsite/renderer/converters/RootDocumentableConverterTest.kt
@@ -404,9 +404,15 @@
""".render().toc()
val tocPackage = toc.item()
- kotlinOnly { assertThat(tocPackage.data.objects.single().name).isEqualTo("Bar.Baz") }
- javaOnly { assertThat(tocPackage.data.objects).isEmpty() }
- assertThat(tocPackage.data.classes.size).isEqualTo(2)
+ kotlinOnly {
+ assertThat(tocPackage.data.objects.single().name).isEqualTo("Bar.Baz")
+ assertThat(tocPackage.data.classes.map { it.name }).containsExactly("Foo", "Bar")
+ }
+ javaOnly {
+ assertThat(tocPackage.data.objects).isEmpty()
+ assertThat(tocPackage.data.classes.map { it.name })
+ .containsExactly("Foo", "Bar", "Bar.Baz")
+ }
}
@Test
diff --git a/testData/companionStatic/docs/reference/dokkatest/_toc.yaml b/testData/companionStatic/docs/reference/dokkatest/_toc.yaml
index 979c769..3fa9a2a 100644
--- a/testData/companionStatic/docs/reference/dokkatest/_toc.yaml
+++ b/testData/companionStatic/docs/reference/dokkatest/_toc.yaml
@@ -16,18 +16,32 @@
path: "/reference/dokkatest/companionStatic/ContainerOfBoring.html"
- title: "ContainerOfInheriting"
path: "/reference/dokkatest/companionStatic/ContainerOfInheriting.html"
+ - title: "ContainerOfInheriting.Companion"
+ path: "/reference/dokkatest/companionStatic/ContainerOfInheriting.Companion.html"
- title: "ContainerOfLateinit"
path: "/reference/dokkatest/companionStatic/ContainerOfLateinit.html"
- title: "ContainerOfNamed"
path: "/reference/dokkatest/companionStatic/ContainerOfNamed.html"
+ - title: "ContainerOfNamed.NamedCompanion"
+ path: "/reference/dokkatest/companionStatic/ContainerOfNamed.NamedCompanion.html"
- title: "ContainerOfWithNested"
path: "/reference/dokkatest/companionStatic/ContainerOfWithNested.html"
+ - title: "ContainerOfWithNested.Companion"
+ path: "/reference/dokkatest/companionStatic/ContainerOfWithNested.Companion.html"
- title: "JavaStatics"
path: "/reference/dokkatest/companionStatic/JavaStatics.html"
- title: "JavaStatics.InnerJavaStatics"
path: "/reference/dokkatest/companionStatic/JavaStatics.InnerJavaStatics.html"
- title: "KotlinObjectsKt"
path: "/reference/dokkatest/companionStatic/KotlinObjectsKt.html"
+ - title: "TopLevelInheritingObject"
+ path: "/reference/dokkatest/companionStatic/TopLevelInheritingObject.html"
+ - title: "TopLevelMultiInheritingObject"
+ path: "/reference/dokkatest/companionStatic/TopLevelMultiInheritingObject.html"
+ - title: "TopLevelObject"
+ path: "/reference/dokkatest/companionStatic/TopLevelObject.html"
+ - title: "TopLevelObject.InsideAnotherObjectObject"
+ path: "/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html"
- title: "Annotations"
diff --git a/testData/companionStatic/docs/reference/dokkatest/classes.html b/testData/companionStatic/docs/reference/dokkatest/classes.html
index 0a39c9f..4f5fdd8 100644
--- a/testData/companionStatic/docs/reference/dokkatest/classes.html
+++ b/testData/companionStatic/docs/reference/dokkatest/classes.html
@@ -121,6 +121,10 @@
<td><code><a href="/reference/dokkatest/companionStatic/TopLevelObject.html">TopLevelObject</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/companionStatic/docs/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html b/testData/companionStatic/docs/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html
new file mode 100644
index 0000000..dd118a6
--- /dev/null
+++ b/testData/companionStatic/docs/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html
@@ -0,0 +1,82 @@
+<html devsite="true">
+ <head>
+ <title>TopLevelObject.InsideAnotherObjectObject</title>
+{% setvar book_path %}/reference/dokkatest/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+ </head>
+ <body>
+ <div id="metadata-info-block"></div>
+ <h1>TopLevelObject.InsideAnotherObjectObject</h1>
+ <p>
+ <pre>public static class <a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></pre>
+ </p>
+ <hr>
+ <h2>Summary</h2>
+ <div class="devsite-table-wrapper">
+ <table class="responsive">
+ <colgroup>
+ <col width="40%">
+ <col>
+ </colgroup>
+ <thead>
+ <tr>
+ <th colspan="100%"><h3>Constants</h3></th>
+ </tr>
+ </thead>
+ <tbody class="list">
+ <tr>
+ <td><code>static final int</code></td>
+ <td>
+ <div><code><a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectNonStaticProperty()">objectObjectNonStaticProperty</a> = 5</code></div>
+ </td>
+ </tr>
+ <tr>
+ <td><code>static final int</code></td>
+ <td>
+ <div><code><a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectStaticProperty()">objectObjectStaticProperty</a> = 5</code></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="devsite-table-wrapper">
+ <table class="responsive">
+ <colgroup>
+ <col width="40%">
+ <col>
+ </colgroup>
+ <thead>
+ <tr>
+ <th colspan="100%"><h3>Public fields</h3></th>
+ </tr>
+ </thead>
+ <tbody class="list">
+ <tr>
+ <td><code>static @<a href="/reference/androidx/annotation/NonNull.html">NonNull</a> <a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></code></td>
+ <td>
+ <div><code><a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#INSTANCE()">INSTANCE</a></code></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="list">
+ <h2>Constants</h2>
+ <div class="api-item"><a name="getObjectObjectNonStaticProperty()"></a><a name="setObjectObjectNonStaticProperty()"></a><a name="getObjectObjectNonStaticProperty--"></a><a name="setObjectObjectNonStaticProperty--"></a>
+ <h3 class="api-name" id="objectObjectNonStaticProperty()">objectObjectNonStaticProperty</h3>
+ <pre class="api-signature no-pretty-print">public static final int <a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectNonStaticProperty()">objectObjectNonStaticProperty</a> = 5</pre>
+ </div>
+ <div class="api-item"><a name="getObjectObjectStaticProperty()"></a><a name="setObjectObjectStaticProperty()"></a><a name="getObjectObjectStaticProperty--"></a><a name="setObjectObjectStaticProperty--"></a>
+ <h3 class="api-name" id="objectObjectStaticProperty()">objectObjectStaticProperty</h3>
+ <pre class="api-signature no-pretty-print">public static final int <a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectStaticProperty()">objectObjectStaticProperty</a> = 5</pre>
+ </div>
+ </div>
+ <div class="list">
+ <h2>Public fields</h2>
+ <div class="api-item"><a name="getINSTANCE()"></a><a name="setINSTANCE()"></a><a name="getINSTANCE--"></a><a name="setINSTANCE--"></a>
+ <h3 class="api-name" id="INSTANCE()">INSTANCE</h3>
+ <pre class="api-signature no-pretty-print">public static @<a href="/reference/androidx/annotation/NonNull.html">NonNull</a> <a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a> <a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#INSTANCE()">INSTANCE</a></pre>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/testData/companionStatic/docs/reference/dokkatest/companionStatic/TopLevelObject.html b/testData/companionStatic/docs/reference/dokkatest/companionStatic/TopLevelObject.html
index fd86cd5..555143a 100644
--- a/testData/companionStatic/docs/reference/dokkatest/companionStatic/TopLevelObject.html
+++ b/testData/companionStatic/docs/reference/dokkatest/companionStatic/TopLevelObject.html
@@ -20,6 +20,26 @@
</colgroup>
<thead>
<tr>
+ <th colspan="100%"><h3>Nested types</h3></th>
+ </tr>
+ </thead>
+ <tbody class="list">
+ <tr>
+ <td>
+ <div><code>public static class <a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></code></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="devsite-table-wrapper">
+ <table class="responsive">
+ <colgroup>
+ <col width="40%">
+ <col>
+ </colgroup>
+ <thead>
+ <tr>
<th colspan="100%"><h3>Constants</h3></th>
</tr>
</thead>
diff --git a/testData/companionStatic/docs/reference/dokkatest/companionStatic/package-summary.html b/testData/companionStatic/docs/reference/dokkatest/companionStatic/package-summary.html
index 991934f..8d31094 100644
--- a/testData/companionStatic/docs/reference/dokkatest/companionStatic/package-summary.html
+++ b/testData/companionStatic/docs/reference/dokkatest/companionStatic/package-summary.html
@@ -65,6 +65,34 @@
<td><code><a href="/reference/dokkatest/companionStatic/KotlinObjectsKt.html">KotlinObjectsKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/ContainerOfInheriting.Companion.html">ContainerOfInheriting.Companion</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/ContainerOfNamed.NamedCompanion.html">ContainerOfNamed.NamedCompanion</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/ContainerOfWithNested.Companion.html">ContainerOfWithNested.Companion</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/TopLevelInheritingObject.html">TopLevelInheritingObject</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/TopLevelMultiInheritingObject.html">TopLevelMultiInheritingObject</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/TopLevelObject.html">TopLevelObject</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/companionStatic/docs/reference/kotlin/dokkatest/_toc.yaml b/testData/companionStatic/docs/reference/kotlin/dokkatest/_toc.yaml
index 66b1a6d..2f503b4 100644
--- a/testData/companionStatic/docs/reference/kotlin/dokkatest/_toc.yaml
+++ b/testData/companionStatic/docs/reference/kotlin/dokkatest/_toc.yaml
@@ -50,4 +50,6 @@
path: "/reference/kotlin/dokkatest/companionStatic/TopLevelMultiInheritingObject.html"
- title: "TopLevelObject"
path: "/reference/kotlin/dokkatest/companionStatic/TopLevelObject.html"
+ - title: "TopLevelObject.InsideAnotherObjectObject"
+ path: "/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html"
diff --git a/testData/companionStatic/docs/reference/kotlin/dokkatest/classes.html b/testData/companionStatic/docs/reference/kotlin/dokkatest/classes.html
index 87ab264..9a46171 100644
--- a/testData/companionStatic/docs/reference/kotlin/dokkatest/classes.html
+++ b/testData/companionStatic/docs/reference/kotlin/dokkatest/classes.html
@@ -113,6 +113,10 @@
<td><code><a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.html">TopLevelObject</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html b/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html
new file mode 100644
index 0000000..e6836f4
--- /dev/null
+++ b/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html
@@ -0,0 +1,54 @@
+<html devsite="true">
+ <head>
+ <title>TopLevelObject.InsideAnotherObjectObject</title>
+{% setvar book_path %}/reference/kotlin/dokkatest/_book.yaml{% endsetvar %}
+{% include "_shared/_reference-head-tags.html" %}
+ </head>
+ <body>
+ <div id="metadata-info-block"></div>
+ <h1>TopLevelObject.InsideAnotherObjectObject</h1>
+ <p>
+ <pre>object <a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></pre>
+ </p>
+ <hr>
+ <h2>Summary</h2>
+ <div class="devsite-table-wrapper">
+ <table class="responsive">
+ <colgroup>
+ <col width="40%">
+ <col>
+ </colgroup>
+ <thead>
+ <tr>
+ <th colspan="100%"><h3>Constants</h3></th>
+ </tr>
+ </thead>
+ <tbody class="list">
+ <tr>
+ <td><code>const <a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html">Int</a></code></td>
+ <td>
+ <div><code><a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectNonStaticProperty()">objectObjectNonStaticProperty</a> = 5</code></div>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html">Int</a></code></td>
+ <td>
+ <div><code><a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectStaticProperty()">objectObjectStaticProperty</a> = 5</code></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="list">
+ <h2>Constants</h2>
+ <div class="api-item"><a name="getObjectObjectNonStaticProperty()"></a><a name="setObjectObjectNonStaticProperty()"></a><a name="getObjectObjectNonStaticProperty--"></a><a name="setObjectObjectNonStaticProperty--"></a>
+ <h3 class="api-name" id="objectObjectNonStaticProperty()">objectObjectNonStaticProperty</h3>
+ <pre class="api-signature no-pretty-print">const val <a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectNonStaticProperty()">objectObjectNonStaticProperty</a> = 5: <a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html">Int</a></pre>
+ </div>
+ <div class="api-item"><a name="getObjectObjectStaticProperty()"></a><a name="setObjectObjectStaticProperty()"></a><a name="getObjectObjectStaticProperty--"></a><a name="setObjectObjectStaticProperty--"></a>
+ <h3 class="api-name" id="objectObjectStaticProperty()">objectObjectStaticProperty</h3>
+ <pre class="api-signature no-pretty-print">val <a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html#objectObjectStaticProperty()">objectObjectStaticProperty</a> = 5: <a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html">Int</a></pre>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/TopLevelObject.html b/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/TopLevelObject.html
index af4c724..b36c93e 100644
--- a/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/TopLevelObject.html
+++ b/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/TopLevelObject.html
@@ -20,6 +20,26 @@
</colgroup>
<thead>
<tr>
+ <th colspan="100%"><h3>Nested types</h3></th>
+ </tr>
+ </thead>
+ <tbody class="list">
+ <tr>
+ <td>
+ <div><code>object <a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></code></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="devsite-table-wrapper">
+ <table class="responsive">
+ <colgroup>
+ <col width="40%">
+ <col>
+ </colgroup>
+ <thead>
+ <tr>
<th colspan="100%"><h3>Constants</h3></th>
</tr>
</thead>
diff --git a/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/package-summary.html b/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/package-summary.html
index 2a3a6b1..c56e842 100644
--- a/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/package-summary.html
+++ b/testData/companionStatic/docs/reference/kotlin/dokkatest/companionStatic/package-summary.html
@@ -77,6 +77,10 @@
<td><code><a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.html">TopLevelObject</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/kotlin/dokkatest/companionStatic/TopLevelObject.InsideAnotherObjectObject.html">TopLevelObject.InsideAnotherObjectObject</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/companionStatic/source/dokkatest/companionStatic/KotlinObjects.kt b/testData/companionStatic/source/dokkatest/companionStatic/KotlinObjects.kt
index ac382af..2544fe6 100644
--- a/testData/companionStatic/source/dokkatest/companionStatic/KotlinObjects.kt
+++ b/testData/companionStatic/source/dokkatest/companionStatic/KotlinObjects.kt
@@ -51,6 +51,11 @@
const val namedTopLevelconst = 4.125
lateinit var topLevelLateInitVar: String
@JvmStatic lateinit var topLevelStaticLateInitVar: String
+ // Modifier 'companion' is not applicable inside 'object'
+ object InsideAnotherObjectObject {
+ @JvmStatic val objectObjectStaticProperty = 5
+ const val objectObjectNonStaticProperty = 5
+ }
}
// Modifier 'open' is not applicable to '(companion )object'
object TopLevelInheritingObject : Exception() {
diff --git a/testData/compose/docs/reference/androidx/_toc.yaml b/testData/compose/docs/reference/androidx/_toc.yaml
index 6e7986f..66dd598 100644
--- a/testData/compose/docs/reference/androidx/_toc.yaml
+++ b/testData/compose/docs/reference/androidx/_toc.yaml
@@ -116,6 +116,8 @@
path: "/reference/androidx/compose/animation/core/AnimatableKt.html"
- title: "AnimateAsStateKt"
path: "/reference/androidx/compose/animation/core/AnimateAsStateKt.html"
+ - title: "AnimationConstants"
+ path: "/reference/androidx/compose/animation/core/AnimationConstants.html"
- title: "AnimationKt"
path: "/reference/androidx/compose/animation/core/AnimationKt.html"
- title: "AnimationResult"
@@ -156,6 +158,8 @@
path: "/reference/androidx/compose/animation/core/FloatSpringSpec.html"
- title: "FloatTweenSpec"
path: "/reference/androidx/compose/animation/core/FloatTweenSpec.html"
+ - title: "InfiniteAnimationPolicy.Key"
+ path: "/reference/androidx/compose/animation/core/InfiniteAnimationPolicy.Key.html"
- title: "InfiniteAnimationPolicyKt"
path: "/reference/androidx/compose/animation/core/InfiniteAnimationPolicyKt.html"
- title: "InfiniteRepeatableSpec"
@@ -176,6 +180,8 @@
path: "/reference/androidx/compose/animation/core/RepeatableSpec.html"
- title: "SnapSpec"
path: "/reference/androidx/compose/animation/core/SnapSpec.html"
+ - title: "Spring"
+ path: "/reference/androidx/compose/animation/core/Spring.html"
- title: "SpringSpec"
path: "/reference/androidx/compose/animation/core/SpringSpec.html"
- title: "SuspendAnimationKt"
@@ -322,6 +328,8 @@
path: "/reference/androidx/compose/foundation/gestures/ForEachGestureKt.html"
- title: "ScrollExtensionsKt"
path: "/reference/androidx/compose/foundation/gestures/ScrollExtensionsKt.html"
+ - title: "ScrollableDefaults"
+ path: "/reference/androidx/compose/foundation/gestures/ScrollableDefaults.html"
- title: "ScrollableKt"
path: "/reference/androidx/compose/foundation/gestures/ScrollableKt.html"
- title: "ScrollableStateKt"
@@ -424,6 +432,10 @@
section:
- title: "AlignmentLineKt"
path: "/reference/androidx/compose/foundation/layout/AlignmentLineKt.html"
+ - title: "Arrangement"
+ path: "/reference/androidx/compose/foundation/layout/Arrangement.html"
+ - title: "Arrangement.Absolute"
+ path: "/reference/androidx/compose/foundation/layout/Arrangement.Absolute.html"
- title: "AspectRatioKt"
path: "/reference/androidx/compose/foundation/layout/AspectRatioKt.html"
- title: "BoxKt"
@@ -640,32 +652,46 @@
path: "/reference/androidx/compose/material/AndroidAlertDialogKt.html"
- title: "AndroidMenuKt"
path: "/reference/androidx/compose/material/AndroidMenuKt.html"
+ - title: "AppBarDefaults"
+ path: "/reference/androidx/compose/material/AppBarDefaults.html"
- title: "AppBarKt"
path: "/reference/androidx/compose/material/AppBarKt.html"
+ - title: "BackdropScaffoldDefaults"
+ path: "/reference/androidx/compose/material/BackdropScaffoldDefaults.html"
- title: "BackdropScaffoldKt"
path: "/reference/androidx/compose/material/BackdropScaffoldKt.html"
- title: "BackdropScaffoldState"
path: "/reference/androidx/compose/material/BackdropScaffoldState.html"
- title: "BottomDrawerState"
path: "/reference/androidx/compose/material/BottomDrawerState.html"
+ - title: "BottomNavigationDefaults"
+ path: "/reference/androidx/compose/material/BottomNavigationDefaults.html"
- title: "BottomNavigationKt"
path: "/reference/androidx/compose/material/BottomNavigationKt.html"
+ - title: "BottomSheetScaffoldDefaults"
+ path: "/reference/androidx/compose/material/BottomSheetScaffoldDefaults.html"
- title: "BottomSheetScaffoldKt"
path: "/reference/androidx/compose/material/BottomSheetScaffoldKt.html"
- title: "BottomSheetScaffoldState"
path: "/reference/androidx/compose/material/BottomSheetScaffoldState.html"
- title: "BottomSheetState"
path: "/reference/androidx/compose/material/BottomSheetState.html"
+ - title: "ButtonDefaults"
+ path: "/reference/androidx/compose/material/ButtonDefaults.html"
- title: "ButtonKt"
path: "/reference/androidx/compose/material/ButtonKt.html"
- title: "CardKt"
path: "/reference/androidx/compose/material/CardKt.html"
+ - title: "CheckboxDefaults"
+ path: "/reference/androidx/compose/material/CheckboxDefaults.html"
- title: "CheckboxKt"
path: "/reference/androidx/compose/material/CheckboxKt.html"
- title: "Colors"
path: "/reference/androidx/compose/material/Colors.html"
- title: "ColorsKt"
path: "/reference/androidx/compose/material/ColorsKt.html"
+ - title: "ContentAlpha"
+ path: "/reference/androidx/compose/material/ContentAlpha.html"
- title: "ContentAlphaKt"
path: "/reference/androidx/compose/material/ContentAlphaKt.html"
- title: "ContentColorKt"
@@ -674,6 +700,8 @@
path: "/reference/androidx/compose/material/DismissState.html"
- title: "DividerKt"
path: "/reference/androidx/compose/material/DividerKt.html"
+ - title: "DrawerDefaults"
+ path: "/reference/androidx/compose/material/DrawerDefaults.html"
- title: "DrawerKt"
path: "/reference/androidx/compose/material/DrawerKt.html"
- title: "DrawerState"
@@ -684,6 +712,8 @@
path: "/reference/androidx/compose/material/FabPosition.html"
- title: "FixedThreshold"
path: "/reference/androidx/compose/material/FixedThreshold.html"
+ - title: "FloatingActionButtonDefaults"
+ path: "/reference/androidx/compose/material/FloatingActionButtonDefaults.html"
- title: "FloatingActionButtonKt"
path: "/reference/androidx/compose/material/FloatingActionButtonKt.html"
- title: "FractionalThreshold"
@@ -694,16 +724,26 @@
path: "/reference/androidx/compose/material/IconKt.html"
- title: "ListItemKt"
path: "/reference/androidx/compose/material/ListItemKt.html"
+ - title: "MaterialTheme"
+ path: "/reference/androidx/compose/material/MaterialTheme.html"
- title: "MaterialThemeKt"
path: "/reference/androidx/compose/material/MaterialThemeKt.html"
+ - title: "MenuDefaults"
+ path: "/reference/androidx/compose/material/MenuDefaults.html"
+ - title: "ModalBottomSheetDefaults"
+ path: "/reference/androidx/compose/material/ModalBottomSheetDefaults.html"
- title: "ModalBottomSheetKt"
path: "/reference/androidx/compose/material/ModalBottomSheetKt.html"
- title: "ModalBottomSheetState"
path: "/reference/androidx/compose/material/ModalBottomSheetState.html"
- title: "OutlinedTextFieldKt"
path: "/reference/androidx/compose/material/OutlinedTextFieldKt.html"
+ - title: "ProgressIndicatorDefaults"
+ path: "/reference/androidx/compose/material/ProgressIndicatorDefaults.html"
- title: "ProgressIndicatorKt"
path: "/reference/androidx/compose/material/ProgressIndicatorKt.html"
+ - title: "RadioButtonDefaults"
+ path: "/reference/androidx/compose/material/RadioButtonDefaults.html"
- title: "RadioButtonKt"
path: "/reference/androidx/compose/material/RadioButtonKt.html"
- title: "ResistanceConfig"
@@ -714,8 +754,12 @@
path: "/reference/androidx/compose/material/ScaffoldState.html"
- title: "Shapes"
path: "/reference/androidx/compose/material/Shapes.html"
+ - title: "SliderDefaults"
+ path: "/reference/androidx/compose/material/SliderDefaults.html"
- title: "SliderKt"
path: "/reference/androidx/compose/material/SliderKt.html"
+ - title: "SnackbarDefaults"
+ path: "/reference/androidx/compose/material/SnackbarDefaults.html"
- title: "SnackbarHostKt"
path: "/reference/androidx/compose/material/SnackbarHostKt.html"
- title: "SnackbarHostState"
@@ -728,18 +772,26 @@
path: "/reference/androidx/compose/material/SwipeProgress.html"
- title: "SwipeToDismissKt"
path: "/reference/androidx/compose/material/SwipeToDismissKt.html"
+ - title: "SwipeableDefaults"
+ path: "/reference/androidx/compose/material/SwipeableDefaults.html"
- title: "SwipeableKt"
path: "/reference/androidx/compose/material/SwipeableKt.html"
- title: "SwipeableState"
path: "/reference/androidx/compose/material/SwipeableState.html"
+ - title: "SwitchDefaults"
+ path: "/reference/androidx/compose/material/SwitchDefaults.html"
- title: "SwitchKt"
path: "/reference/androidx/compose/material/SwitchKt.html"
- title: "TabKt"
path: "/reference/androidx/compose/material/TabKt.html"
- title: "TabPosition"
path: "/reference/androidx/compose/material/TabPosition.html"
+ - title: "TabRowDefaults"
+ path: "/reference/androidx/compose/material/TabRowDefaults.html"
- title: "TabRowKt"
path: "/reference/androidx/compose/material/TabRowKt.html"
+ - title: "TextFieldDefaults"
+ path: "/reference/androidx/compose/material/TextFieldDefaults.html"
- title: "TextFieldKt"
path: "/reference/androidx/compose/material/TextFieldKt.html"
- title: "TextKt"
@@ -782,6 +834,18 @@
- title: "Classes"
section:
+ - title: "Icons"
+ path: "/reference/androidx/compose/material/icons/Icons.html"
+ - title: "Icons.Filled"
+ path: "/reference/androidx/compose/material/icons/Icons.Filled.html"
+ - title: "Icons.Outlined"
+ path: "/reference/androidx/compose/material/icons/Icons.Outlined.html"
+ - title: "Icons.Rounded"
+ path: "/reference/androidx/compose/material/icons/Icons.Rounded.html"
+ - title: "Icons.Sharp"
+ path: "/reference/androidx/compose/material/icons/Icons.Sharp.html"
+ - title: "Icons.TwoTone"
+ path: "/reference/androidx/compose/material/icons/Icons.TwoTone.html"
- title: "IconsKt"
path: "/reference/androidx/compose/material/icons/IconsKt.html"
@@ -870,6 +934,8 @@
path: "/reference/androidx/compose/runtime/EffectsKt.html"
- title: "ExpectKt"
path: "/reference/androidx/compose/runtime/ExpectKt.html"
+ - title: "MonotonicFrameClock.Key"
+ path: "/reference/androidx/compose/runtime/MonotonicFrameClock.Key.html"
- title: "MonotonicFrameClockKt"
path: "/reference/androidx/compose/runtime/MonotonicFrameClockKt.html"
- title: "PausableMonotonicFrameClock"
@@ -1028,6 +1094,8 @@
path: "/reference/androidx/compose/runtime/snapshots/SnapshotApplyResult.html"
- title: "SnapshotApplyResult.Failure"
path: "/reference/androidx/compose/runtime/snapshots/SnapshotApplyResult.Failure.html"
+ - title: "SnapshotApplyResult.Success"
+ path: "/reference/androidx/compose/runtime/snapshots/SnapshotApplyResult.Success.html"
- title: "SnapshotKt"
path: "/reference/androidx/compose/runtime/snapshots/SnapshotKt.html"
- title: "SnapshotStateList"
diff --git a/testData/compose/docs/reference/androidx/compose/animation/core/package-summary.html b/testData/compose/docs/reference/androidx/compose/animation/core/package-summary.html
index f3a80c3..84cd558 100644
--- a/testData/compose/docs/reference/androidx/compose/animation/core/package-summary.html
+++ b/testData/compose/docs/reference/androidx/compose/animation/core/package-summary.html
@@ -392,6 +392,20 @@
<td><code><a href="/reference/androidx/compose/animation/core/VisibilityThresholdsKt.html">VisibilityThresholdsKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/animation/core/AnimationConstants.html">AnimationConstants</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/animation/core/InfiniteAnimationPolicy.Key.html">InfiniteAnimationPolicy.Key</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/animation/core/Spring.html">Spring</a></code></td>
+ <td>
+ <p>Physics class contains a number of recommended configurations for physics animations.</p>
+ </td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/compose/docs/reference/androidx/compose/foundation/gestures/package-summary.html b/testData/compose/docs/reference/androidx/compose/foundation/gestures/package-summary.html
index 9cf7a57..befc9e6 100644
--- a/testData/compose/docs/reference/androidx/compose/foundation/gestures/package-summary.html
+++ b/testData/compose/docs/reference/androidx/compose/foundation/gestures/package-summary.html
@@ -113,6 +113,12 @@
<td><code><a href="/reference/androidx/compose/foundation/gestures/TransformableStateKt.html">TransformableStateKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/foundation/gestures/ScrollableDefaults.html">ScrollableDefaults</a></code></td>
+ <td>
+ <p>Contains the default values used by <code><a href="/reference/androidx/compose/foundation/gestures/package-summary.html#(androidx.compose.ui.Modifier).scrollable(androidx.compose.foundation.gestures.ScrollableState,androidx.compose.foundation.gestures.Orientation,kotlin.Boolean,kotlin.Boolean,androidx.compose.foundation.gestures.FlingBehavior,androidx.compose.foundation.interaction.MutableInteractionSource)">scrollable</a></code></p>
+ </td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/compose/docs/reference/androidx/compose/foundation/layout/package-summary.html b/testData/compose/docs/reference/androidx/compose/foundation/layout/package-summary.html
index cf0eff3..dbefd3d 100644
--- a/testData/compose/docs/reference/androidx/compose/foundation/layout/package-summary.html
+++ b/testData/compose/docs/reference/androidx/compose/foundation/layout/package-summary.html
@@ -142,6 +142,16 @@
<td><code><a href="/reference/androidx/compose/foundation/layout/SpacerKt.html">SpacerKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/foundation/layout/Arrangement.html">Arrangement</a></code></td>
+ <td>
+ <p>Used to specify the arrangement of the layout's children in layouts like <code><a href="/reference/androidx/compose/foundation/layout/package-summary.html#Row(androidx.compose.ui.Modifier,androidx.compose.foundation.layout.Arrangement.Horizontal,androidx.compose.ui.Alignment.Vertical,kotlin.Function1)">Row</a></code> or <code><a href="/reference/androidx/compose/foundation/layout/package-summary.html#Column(androidx.compose.ui.Modifier,androidx.compose.foundation.layout.Arrangement.Vertical,androidx.compose.ui.Alignment.Horizontal,kotlin.Function1)">Column</a></code> in the main axis direction (horizontal and vertical, respectively).</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/foundation/layout/Arrangement.Absolute.html">Arrangement.Absolute</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/compose/docs/reference/androidx/compose/material/icons/package-summary.html b/testData/compose/docs/reference/androidx/compose/material/icons/package-summary.html
index f8daac7..9d5c52e 100644
--- a/testData/compose/docs/reference/androidx/compose/material/icons/package-summary.html
+++ b/testData/compose/docs/reference/androidx/compose/material/icons/package-summary.html
@@ -18,6 +18,42 @@
<td><code><a href="/reference/androidx/compose/material/icons/IconsKt.html">IconsKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/icons/Icons.html">Icons</a></code></td>
+ <td>
+ <p><a href="https://material.io/design/iconography/system-icons.html" class="external" target="_blank">Material Design system icons</a> as seen on <a href="https://fonts.google.com/icons" class="external" target="_blank">Google Fonts</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/icons/Icons.Filled.html">Icons.Filled</a></code></td>
+ <td>
+ <p><a href="https://material.io/resources/icons/?style=baseline">Filled icons</a> (previously the only available theme, also known as the baseline theme) are the default icon theme.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/icons/Icons.Outlined.html">Icons.Outlined</a></code></td>
+ <td>
+ <p><a href="https://material.io/resources/icons/?style=outline">Outlined icons</a> make use of a thin stroke and empty space inside for a lighter appearance.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/icons/Icons.Rounded.html">Icons.Rounded</a></code></td>
+ <td>
+ <p><a href="https://material.io/resources/icons/?style=round">Rounded icons</a> use a corner radius that pairs well with brands that use heavier typography, curved logos, or circular elements to express their style.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/icons/Icons.Sharp.html">Icons.Sharp</a></code></td>
+ <td>
+ <p><a href="https://material.io/resources/icons/?style=sharp">Sharp icons</a> display corners with straight edges, for a crisp style that remains legible even at smaller scales.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/icons/Icons.TwoTone.html">Icons.TwoTone</a></code></td>
+ <td>
+ <p><a href="https://material.io/resources/icons/?style=twotone">Two-Tone icons</a> display corners with straight edges, for a crisp style that remains legible even at smaller scales.</p>
+ </td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/compose/docs/reference/androidx/compose/material/package-summary.html b/testData/compose/docs/reference/androidx/compose/material/package-summary.html
index 92945cd..cd99689 100644
--- a/testData/compose/docs/reference/androidx/compose/material/package-summary.html
+++ b/testData/compose/docs/reference/androidx/compose/material/package-summary.html
@@ -364,6 +364,126 @@
<p><a href="https://material.io/design/typography/the-type-system.html#type-scale" class="external" target="_blank">Material Design type scale</a>.</p>
</td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/AppBarDefaults.html">AppBarDefaults</a></code></td>
+ <td>
+ <p>Contains default values used for <code><a href="/reference/androidx/compose/material/package-summary.html#TopAppBar(kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Function0,kotlin.Function1,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp)">TopAppBar</a></code> and <code><a href="/reference/androidx/compose/material/package-summary.html#BottomAppBar(androidx.compose.ui.Modifier,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Shape,androidx.compose.ui.unit.Dp,androidx.compose.foundation.layout.PaddingValues,kotlin.Function1)">BottomAppBar</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/BackdropScaffoldDefaults.html">BackdropScaffoldDefaults</a></code></td>
+ <td>
+ <p>Contains useful defaults for <code><a href="/reference/androidx/compose/material/package-summary.html#BackdropScaffold(kotlin.Function0,kotlin.Function0,kotlin.Function0,androidx.compose.ui.Modifier,androidx.compose.material.BackdropScaffoldState,kotlin.Boolean,androidx.compose.ui.unit.Dp,androidx.compose.ui.unit.Dp,kotlin.Boolean,kotlin.Boolean,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Shape,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,kotlin.Function1)">BackdropScaffold</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/BottomNavigationDefaults.html">BottomNavigationDefaults</a></code></td>
+ <td>
+ <p>Contains default values used for <code><a href="/reference/androidx/compose/material/package-summary.html#BottomNavigation(androidx.compose.ui.Modifier,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp,kotlin.Function1)">BottomNavigation</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/BottomSheetScaffoldDefaults.html">BottomSheetScaffoldDefaults</a></code></td>
+ <td>
+ <p>Contains useful defaults for <code><a href="/reference/androidx/compose/material/package-summary.html#BottomSheetScaffold(kotlin.Function1,androidx.compose.ui.Modifier,androidx.compose.material.BottomSheetScaffoldState,kotlin.Function0,kotlin.Function1,kotlin.Function0,androidx.compose.material.FabPosition,kotlin.Boolean,androidx.compose.ui.graphics.Shape,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp,kotlin.Function1,kotlin.Boolean,androidx.compose.ui.graphics.Shape,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,kotlin.Function1)">BottomSheetScaffold</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/ButtonDefaults.html">ButtonDefaults</a></code></td>
+ <td>
+ <p>Contains the default values used by <code><a href="/reference/androidx/compose/material/package-summary.html#Button(kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.material.ButtonElevation,androidx.compose.ui.graphics.Shape,androidx.compose.foundation.BorderStroke,androidx.compose.material.ButtonColors,androidx.compose.foundation.layout.PaddingValues,kotlin.Function1)">Button</a></code></p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/CheckboxDefaults.html">CheckboxDefaults</a></code></td>
+ <td>
+ <p>Defaults used in <code><a href="/reference/androidx/compose/material/package-summary.html#Checkbox(kotlin.Boolean,kotlin.Function1,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.material.CheckboxColors)">Checkbox</a></code> and <code><a href="/reference/androidx/compose/material/package-summary.html#TriStateCheckbox(androidx.compose.ui.state.ToggleableState,kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.material.CheckboxColors)">TriStateCheckbox</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/ContentAlpha.html">ContentAlpha</a></code></td>
+ <td>
+ <p>Default alpha levels used by Material components.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/DrawerDefaults.html">DrawerDefaults</a></code></td>
+ <td>
+ <p>Object to hold default values for <code><a href="/reference/androidx/compose/material/package-summary.html#ModalDrawer(kotlin.Function1,androidx.compose.ui.Modifier,androidx.compose.material.DrawerState,kotlin.Boolean,androidx.compose.ui.graphics.Shape,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,kotlin.Function0)">ModalDrawer</a></code> and <code><a href="/reference/androidx/compose/material/package-summary.html#BottomDrawer(kotlin.Function1,androidx.compose.ui.Modifier,androidx.compose.material.BottomDrawerState,kotlin.Boolean,androidx.compose.ui.graphics.Shape,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,kotlin.Function0)">BottomDrawer</a></code></p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/FloatingActionButtonDefaults.html">FloatingActionButtonDefaults</a></code></td>
+ <td>
+ <p>Contains the default values used by <code><a href="/reference/androidx/compose/material/package-summary.html#FloatingActionButton(kotlin.Function0,androidx.compose.ui.Modifier,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.ui.graphics.Shape,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.material.FloatingActionButtonElevation,kotlin.Function0)">FloatingActionButton</a></code></p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/MaterialTheme.html">MaterialTheme</a></code></td>
+ <td>
+ <p>Contains functions to access the current theme values provided at the call site's position in the hierarchy.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/MenuDefaults.html">MenuDefaults</a></code></td>
+ <td>
+ <p>Contains default values used for <code><a href="/reference/androidx/compose/material/package-summary.html#DropdownMenuItem(kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.foundation.layout.PaddingValues,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Function1)">DropdownMenuItem</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/ModalBottomSheetDefaults.html">ModalBottomSheetDefaults</a></code></td>
+ <td>
+ <p>Contains useful Defaults for <code><a href="/reference/androidx/compose/material/package-summary.html#ModalBottomSheetLayout(kotlin.Function1,androidx.compose.ui.Modifier,androidx.compose.material.ModalBottomSheetState,androidx.compose.ui.graphics.Shape,androidx.compose.ui.unit.Dp,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,kotlin.Function0)">ModalBottomSheetLayout</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/ProgressIndicatorDefaults.html">ProgressIndicatorDefaults</a></code></td>
+ <td>
+ <p>Contains the default values used for <code><a href="/reference/androidx/compose/material/package-summary.html#LinearProgressIndicator(kotlin.Float,androidx.compose.ui.Modifier,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color)">LinearProgressIndicator</a></code> and <code><a href="/reference/androidx/compose/material/package-summary.html#CircularProgressIndicator(kotlin.Float,androidx.compose.ui.Modifier,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp)">CircularProgressIndicator</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/RadioButtonDefaults.html">RadioButtonDefaults</a></code></td>
+ <td>
+ <p>Defaults used in <code><a href="/reference/androidx/compose/material/package-summary.html#RadioButton(kotlin.Boolean,kotlin.Function0,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.material.RadioButtonColors)">RadioButton</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/SliderDefaults.html">SliderDefaults</a></code></td>
+ <td>
+ <p>Object to hold defaults used by <code><a href="/reference/androidx/compose/material/package-summary.html#Slider(kotlin.Float,kotlin.Function1,androidx.compose.ui.Modifier,kotlin.Boolean,kotlin.ranges.ClosedFloatingPointRange,kotlin.Int,kotlin.Function0,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.material.SliderColors)">Slider</a></code></p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/SnackbarDefaults.html">SnackbarDefaults</a></code></td>
+ <td>
+ <p>Object to hold defaults used by <code><a href="/reference/androidx/compose/material/package-summary.html#Snackbar(androidx.compose.ui.Modifier,kotlin.Function0,kotlin.Boolean,androidx.compose.ui.graphics.Shape,androidx.compose.ui.graphics.Color,androidx.compose.ui.graphics.Color,androidx.compose.ui.unit.Dp,kotlin.Function0)">Snackbar</a></code></p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/SwipeableDefaults.html">SwipeableDefaults</a></code></td>
+ <td>
+ <p>Contains useful defaults for <code><a href="/reference/androidx/compose/material/package-summary.html#(androidx.compose.ui.Modifier).swipeable(androidx.compose.material.SwipeableState,kotlin.collections.Map,androidx.compose.foundation.gestures.Orientation,kotlin.Boolean,kotlin.Boolean,androidx.compose.foundation.interaction.MutableInteractionSource,kotlin.Function2,androidx.compose.material.ResistanceConfig,androidx.compose.ui.unit.Dp)">swipeable</a></code> and <code><a href="/reference/androidx/compose/material/SwipeableState.html">SwipeableState</a></code>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/SwitchDefaults.html">SwitchDefaults</a></code></td>
+ <td>
+ <p>Contains the default values used by <code><a href="/reference/androidx/compose/material/package-summary.html#Switch(kotlin.Boolean,kotlin.Function1,androidx.compose.ui.Modifier,kotlin.Boolean,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.material.SwitchColors)">Switch</a></code></p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/TabRowDefaults.html">TabRowDefaults</a></code></td>
+ <td>
+ <p>Contains default implementations and values used for TabRow.</p>
+ </td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/material/TextFieldDefaults.html">TextFieldDefaults</a></code></td>
+ <td>
+ <p>Contains the default values used by <code><a href="/reference/androidx/compose/material/package-summary.html#TextField(kotlin.String,kotlin.Function1,androidx.compose.ui.Modifier,kotlin.Boolean,kotlin.Boolean,androidx.compose.ui.text.TextStyle,kotlin.Function0,kotlin.Function0,kotlin.Function0,kotlin.Function0,kotlin.Boolean,androidx.compose.ui.text.input.VisualTransformation,androidx.compose.foundation.text.KeyboardOptions,androidx.compose.foundation.text.KeyboardActions,kotlin.Boolean,kotlin.Int,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.ui.graphics.Shape,androidx.compose.material.TextFieldColors)">TextField</a></code> and <code><a href="/reference/androidx/compose/material/package-summary.html#OutlinedTextField(kotlin.String,kotlin.Function1,androidx.compose.ui.Modifier,kotlin.Boolean,kotlin.Boolean,androidx.compose.ui.text.TextStyle,kotlin.Function0,kotlin.Function0,kotlin.Function0,kotlin.Function0,kotlin.Boolean,androidx.compose.ui.text.input.VisualTransformation,androidx.compose.foundation.text.KeyboardOptions,androidx.compose.foundation.text.KeyboardActions,kotlin.Boolean,kotlin.Int,androidx.compose.foundation.interaction.MutableInteractionSource,androidx.compose.ui.graphics.Shape,androidx.compose.material.TextFieldColors)">OutlinedTextField</a></code>.</p>
+ </td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/compose/docs/reference/androidx/compose/runtime/package-summary.html b/testData/compose/docs/reference/androidx/compose/runtime/package-summary.html
index d152ea3..d807238 100644
--- a/testData/compose/docs/reference/androidx/compose/runtime/package-summary.html
+++ b/testData/compose/docs/reference/androidx/compose/runtime/package-summary.html
@@ -300,6 +300,10 @@
<p>A helper receiver scope class used by <code><a href="/reference/androidx/compose/runtime/package-summary.html#ComposeNode(kotlin.Function0,kotlin.Function1)">ComposeNode</a></code> to help write code to initialized and update a node.</p>
</td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/runtime/MonotonicFrameClock.Key.html">MonotonicFrameClock.Key</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/compose/docs/reference/androidx/compose/runtime/snapshots/package-summary.html b/testData/compose/docs/reference/androidx/compose/runtime/snapshots/package-summary.html
index e516d52..2e1585e 100644
--- a/testData/compose/docs/reference/androidx/compose/runtime/snapshots/package-summary.html
+++ b/testData/compose/docs/reference/androidx/compose/runtime/snapshots/package-summary.html
@@ -91,6 +91,10 @@
<p>Snapshot local value of a state object.</p>
</td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/compose/runtime/snapshots/SnapshotApplyResult.Success.html">SnapshotApplyResult.Success</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/datastore-kmp/docs/reference/androidx/_toc.yaml b/testData/datastore-kmp/docs/reference/androidx/_toc.yaml
index a179731..daa3b81 100644
--- a/testData/datastore-kmp/docs/reference/androidx/_toc.yaml
+++ b/testData/datastore-kmp/docs/reference/androidx/_toc.yaml
@@ -34,6 +34,10 @@
section:
- title: "CloseableKt"
path: "/reference/androidx/datastore/core/CloseableKt.html"
+ - title: "DataStoreFactory"
+ path: "/reference/androidx/datastore/core/DataStoreFactory.html"
+ - title: "MultiProcessDataStoreFactory"
+ path: "/reference/androidx/datastore/core/MultiProcessDataStoreFactory.html"
- title: "StorageConnectionKt"
path: "/reference/androidx/datastore/core/StorageConnectionKt.html"
diff --git a/testData/datastore-kmp/docs/reference/androidx/datastore/core/package-summary.html b/testData/datastore-kmp/docs/reference/androidx/datastore/core/package-summary.html
index 609d908..115f69b 100644
--- a/testData/datastore-kmp/docs/reference/androidx/datastore/core/package-summary.html
+++ b/testData/datastore-kmp/docs/reference/androidx/datastore/core/package-summary.html
@@ -96,6 +96,14 @@
<td><code><a href="/reference/androidx/datastore/core/StorageConnectionKt.html">StorageConnectionKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/datastore/core/DataStoreFactory.html">DataStoreFactory</a></code></td>
+ <td></td>
+ </tr>
+ <tr>
+ <td><code><a href="/reference/androidx/datastore/core/MultiProcessDataStoreFactory.html">MultiProcessDataStoreFactory</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/fragment/docs/reference/androidx/_toc.yaml b/testData/fragment/docs/reference/androidx/_toc.yaml
index 26ee28e..18867d5 100644
--- a/testData/fragment/docs/reference/androidx/_toc.yaml
+++ b/testData/fragment/docs/reference/androidx/_toc.yaml
@@ -80,6 +80,8 @@
- title: "Classes"
section:
+ - title: "FragmentStrictMode"
+ path: "/reference/androidx/fragment/app/strictmode/FragmentStrictMode.html"
- title: "FragmentStrictMode.Policy"
path: "/reference/androidx/fragment/app/strictmode/FragmentStrictMode.Policy.html"
- title: "FragmentStrictMode.Policy.Builder"
diff --git a/testData/fragment/docs/reference/androidx/fragment/app/strictmode/package-summary.html b/testData/fragment/docs/reference/androidx/fragment/app/strictmode/package-summary.html
index a0cc37f..8357ef2 100644
--- a/testData/fragment/docs/reference/androidx/fragment/app/strictmode/package-summary.html
+++ b/testData/fragment/docs/reference/androidx/fragment/app/strictmode/package-summary.html
@@ -43,6 +43,12 @@
<p>Creates <code><a href="/reference/androidx/fragment/app/strictmode/FragmentStrictMode.Policy.html">Policy</a></code> instances.</p>
</td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/fragment/app/strictmode/FragmentStrictMode.html">FragmentStrictMode</a></code></td>
+ <td>
+ <p>FragmentStrictMode is a tool which detects things you might be doing by accident and brings them to your attention so you can fix them.</p>
+ </td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/hiddenParents/docs/reference/dokkatest/_toc.yaml b/testData/hiddenParents/docs/reference/dokkatest/_toc.yaml
index 2610079..54b8ad8 100644
--- a/testData/hiddenParents/docs/reference/dokkatest/_toc.yaml
+++ b/testData/hiddenParents/docs/reference/dokkatest/_toc.yaml
@@ -22,6 +22,8 @@
section:
- title: "ClassWithCompanion"
path: "/reference/dokkatest/hiddenParents/ClassWithCompanion.html"
+ - title: "ClassWithCompanion.Companion"
+ path: "/reference/dokkatest/hiddenParents/ClassWithCompanion.Companion.html"
- title: "DiamondChild"
path: "/reference/dokkatest/hiddenParents/DiamondChild.html"
- title: "PrivateClassWrapper"
diff --git a/testData/hiddenParents/docs/reference/dokkatest/hiddenParents/package-summary.html b/testData/hiddenParents/docs/reference/dokkatest/hiddenParents/package-summary.html
index 1675ce8..cd12c0c 100644
--- a/testData/hiddenParents/docs/reference/dokkatest/hiddenParents/package-summary.html
+++ b/testData/hiddenParents/docs/reference/dokkatest/hiddenParents/package-summary.html
@@ -67,6 +67,10 @@
<td><code><a href="/reference/dokkatest/hiddenParents/VisibleImplementingClass.html">VisibleImplementingClass</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/dokkatest/hiddenParents/ClassWithCompanion.Companion.html">ClassWithCompanion.Companion</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/lifecycle/docs/reference/androidx/_toc.yaml b/testData/lifecycle/docs/reference/androidx/_toc.yaml
index 5eb2cc5..1da06ab 100644
--- a/testData/lifecycle/docs/reference/androidx/_toc.yaml
+++ b/testData/lifecycle/docs/reference/androidx/_toc.yaml
@@ -42,6 +42,8 @@
path: "/reference/androidx/lifecycle/AndroidViewModel.html"
- title: "CoroutineLiveDataKt"
path: "/reference/androidx/lifecycle/CoroutineLiveDataKt.html"
+ - title: "ErrorMessages"
+ path: "/reference/androidx/lifecycle/ErrorMessages.html"
- title: "FlowExtKt"
path: "/reference/androidx/lifecycle/FlowExtKt.html"
- title: "FlowLiveDataConversions"
@@ -196,6 +198,8 @@
section:
- title: "CreationExtras"
path: "/reference/androidx/lifecycle/viewmodel/CreationExtras.html"
+ - title: "CreationExtras.Empty"
+ path: "/reference/androidx/lifecycle/viewmodel/CreationExtras.Empty.html"
- title: "InitializerViewModelFactoryBuilder"
path: "/reference/androidx/lifecycle/viewmodel/InitializerViewModelFactoryBuilder.html"
- title: "InitializerViewModelFactoryKt"
diff --git a/testData/lifecycle/docs/reference/androidx/lifecycle/package-summary.html b/testData/lifecycle/docs/reference/androidx/lifecycle/package-summary.html
index 29da23e..152fd43 100644
--- a/testData/lifecycle/docs/reference/androidx/lifecycle/package-summary.html
+++ b/testData/lifecycle/docs/reference/androidx/lifecycle/package-summary.html
@@ -342,6 +342,10 @@
<td><code><a href="/reference/androidx/lifecycle/writerKt.html">writerKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/lifecycle/ErrorMessages.html">ErrorMessages</a></code></td>
+ <td></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/lifecycle/docs/reference/androidx/lifecycle/viewmodel/package-summary.html b/testData/lifecycle/docs/reference/androidx/lifecycle/viewmodel/package-summary.html
index 3b61f40..df733e4 100644
--- a/testData/lifecycle/docs/reference/androidx/lifecycle/viewmodel/package-summary.html
+++ b/testData/lifecycle/docs/reference/androidx/lifecycle/viewmodel/package-summary.html
@@ -74,6 +74,12 @@
<p>Holds a <code><a href="/reference/androidx/lifecycle/ViewModel.html">ViewModel</a></code> class and initializer for that class</p>
</td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/lifecycle/viewmodel/CreationExtras.Empty.html">CreationExtras.Empty</a></code></td>
+ <td>
+ <p>Empty <code><a href="/reference/androidx/lifecycle/viewmodel/CreationExtras.html">CreationExtras</a></code></p>
+ </td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/testData/paging/docs/reference/androidx/_toc.yaml b/testData/paging/docs/reference/androidx/_toc.yaml
index f7ff0f1..2f73e5b 100644
--- a/testData/paging/docs/reference/androidx/_toc.yaml
+++ b/testData/paging/docs/reference/androidx/_toc.yaml
@@ -60,6 +60,8 @@
path: "/reference/androidx/paging/LoadState.html"
- title: "LoadState.Error"
path: "/reference/androidx/paging/LoadState.Error.html"
+ - title: "LoadState.Loading"
+ path: "/reference/androidx/paging/LoadState.Loading.html"
- title: "LoadState.NotLoading"
path: "/reference/androidx/paging/LoadState.NotLoading.html"
- title: "LoadStateAdapter"
diff --git a/testData/paging/docs/reference/androidx/paging/package-summary.html b/testData/paging/docs/reference/androidx/paging/package-summary.html
index b7eec02..6a126d0 100644
--- a/testData/paging/docs/reference/androidx/paging/package-summary.html
+++ b/testData/paging/docs/reference/androidx/paging/package-summary.html
@@ -429,6 +429,12 @@
<td><code><a href="/reference/androidx/paging/RxPagedListKt.html">RxPagedListKt</a></code></td>
<td></td>
</tr>
+ <tr>
+ <td><code><a href="/reference/androidx/paging/LoadState.Loading.html">LoadState.Loading</a></code></td>
+ <td>
+ <p>Loading is in progress.</p>
+ </td>
+ </tr>
</tbody>
</table>
</div>
