From c9af371aa18dc50490dc3927ed88dfe8836c1bde Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Thu, 20 Aug 2020 19:00:04 +0200 Subject: Improve styles and functionality on module page #1336 --- .../jetbrains/dokka/javadoc/JavadocPageCreator.kt | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'plugins/javadoc/src') diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt index a8e10db5..05de8fa1 100644 --- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt +++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/JavadocPageCreator.kt @@ -6,6 +6,7 @@ import org.jetbrains.dokka.Platform import org.jetbrains.dokka.base.signatures.SignatureProvider import org.jetbrains.dokka.base.transformers.pages.comments.CommentsToContentConverter import org.jetbrains.dokka.base.transformers.pages.comments.DocTagToContentConverter +import org.jetbrains.dokka.base.translators.documentables.briefFromContentNodes import org.jetbrains.dokka.model.* import org.jetbrains.dokka.model.doc.Description import org.jetbrains.dokka.model.doc.Index @@ -171,8 +172,6 @@ open class JavadocPageCreator( sources.firstOrNull { it != expectPresentInSet } ?: sources.firstOrNull() } - private val firstSentenceRegex = Regex("^((?:[^.?!]|[.!?](?!\\s))*[.!?])") - private inline fun Documentable.findNodeInDocumentation(sourceSetData: DokkaSourceSet?): T? = documentation[sourceSetData]?.firstChildOfTypeOrNull() @@ -197,24 +196,6 @@ open class JavadocPageCreator( private fun Documentable.brief(sourceSet: DokkaSourceSet? = highestJvmSourceSet): List = briefFromContentNodes(descriptionToContentNodes(sourceSet)) - private fun briefFromContentNodes(description: List): List { - var sentenceFound = false - fun lookthrough(node: ContentNode): ContentNode = - if (node is ContentText && firstSentenceRegex.containsMatchIn(node.text)) { - sentenceFound = true - node.copy(text = firstSentenceRegex.find(node.text)?.value.orEmpty()) - } else if (node is ContentGroup) { - node.copy(children = node.children.mapNotNull { - if (!sentenceFound) lookthrough(it) else null - }, style = node.style - TextStyle.Paragraph) - } else { - node - } - return description.mapNotNull { - if (!sentenceFound) lookthrough(it) else null - } - } - private fun DParameter.brief(sourceSet: DokkaSourceSet? = highestJvmSourceSet): List = briefFromContentNodes(paramsToContentNodes(sourceSet).dropWhile { it is ContentDRILink }) -- cgit