Fix parsing first word in deprecated (#1595)

Fix parsing first word in `Deprecated` annotations, fix `Throws` and `See` tags

2 files changed, 50 insertions, 13 deletions

diff --git a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
index d05979e3..a3a9ad6a 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt
@@ -6,6 +6,7 @@ import org.jetbrains.dokka.model.doc.*
 import org.jetbrains.dokka.model.properties.PropertyContainer
 import org.jetbrains.dokka.model.toDisplaySourceSets
 import org.jetbrains.dokka.pages.*
+import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 
 open class DocTagToContentConverter : CommentsToContentConverter {
     override fun buildContent(
@@ -148,15 +149,42 @@ open class DocTagToContentConverter : CommentsToContentConverter {
                 )
             )
             is Strikethrough -> buildChildren(docTag, setOf(TextStyle.Strikethrough))
-            is Table -> listOf(
-                ContentTable(
-                    buildTableRows(docTag.children.filterIsInstance<Th>(), CommentTable),
-                    buildTableRows(docTag.children.filterIsInstance<Tr>(), CommentTable),
-                    dci,
-                    sourceSets.toDisplaySourceSets(),
-                    styles + CommentTable
-                )
-            )
+            is Table -> {
+                //https://html.spec.whatwg.org/multipage/tables.html#the-caption-element
+                if (docTag.children.any { it is TBody }) {
+                    val head = docTag.children.filterIsInstance<THead>().flatMap { it.children }
+                    val body = docTag.children.filterIsInstance<TBody>().flatMap { it.children }
+                    listOf(
+                        ContentTable(
+                            header = buildTableRows(head.filterIsInstance<Th>(), CommentTable),
+                            caption = docTag.children.firstIsInstanceOrNull<Caption>()?.let {
+                                ContentGroup(
+                                    buildContent(it, dci, sourceSets),
+                                    dci,
+                                    sourceSets.toDisplaySourceSets(),
+                                    styles,
+                                    extra
+                                )
+                            },
+                            buildTableRows(body.filterIsInstance<Tr>(), CommentTable),
+                            dci,
+                            sourceSets.toDisplaySourceSets(),
+                            styles + CommentTable
+                        )
+                    )
+                } else {
+                    listOf(
+                        ContentTable(
+                            header = buildTableRows(docTag.children.filterIsInstance<Th>(), CommentTable),
+                            caption = null,
+                            buildTableRows(docTag.children.filterIsInstance<Tr>(), CommentTable),
+                            dci,
+                            sourceSets.toDisplaySourceSets(),
+                            styles + CommentTable
+                        )
+                    )
+                }
+            }
             is Th,
             is Tr -> listOf(
                 ContentGroup(
@@ -190,6 +218,15 @@ open class DocTagToContentConverter : CommentsToContentConverter {
             } else {
                 buildChildren(docTag)
             }
+            is Caption -> listOf(
+                ContentGroup(
+                    buildChildren(docTag),
+                    dci,
+                    sourceSets.toDisplaySourceSets(),
+                    styles + ContentStyle.Caption,
+                    extra = extra
+                )
+            )
 
             else -> buildChildren(docTag)
         }
diff --git a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
index 069d1125..2c6d301c 100644
--- a/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/pages/sourcelinks/SourceLinksTransformer.kt
@@ -62,14 +62,14 @@ class SourceLinksTransformer(val context: DokkaContext, val builder: PageContent
     ) {
         header(2, "Sources", kind = ContentKind.Source)
         +ContentTable(
-            emptyList(),
-            sources.map {
+            header = emptyList(),
+            children = sources.map {
                 buildGroup(node.dri, setOf(it.first), kind = ContentKind.Source, extra = mainExtra + SymbolAnchorHint(it.second, ContentKind.Source)) {
                     link("(source)", it.second)
                 }
             },
-            DCI(node.dri, ContentKind.Source),
-            node.documentable!!.sourceSets.toDisplaySourceSets(),
+            dci = DCI(node.dri, ContentKind.Source),
+            sourceSets = node.documentable!!.sourceSets.toDisplaySourceSets(),
             style = emptySet(),
             extra = mainExtra + SimpleAttr.header("Sources")
         )