diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2017-02-24 14:44:55 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2017-02-24 14:44:55 +0100 |
| commit | 0f9dac9ea2137fe5935566d84cb2f5264be1a8ba (patch) | |
| tree | 1064587501fb4e6bad5f4542ddcabfbb31f99749 /core/src/main/kotlin/Kotlin | |
| parent | 004fc0c4eaf9d1ecaa78cf97f7d0fb2e91405031 (diff) | |
| parent | 2ceff9c41cff42b7fb3ffe75ea36a7c570f3615b (diff) | |
| download | dokka-0f9dac9ea2137fe5935566d84cb2f5264be1a8ba.tar.gz dokka-0f9dac9ea2137fe5935566d84cb2f5264be1a8ba.tar.bz2 dokka-0f9dac9ea2137fe5935566d84cb2f5264be1a8ba.zip | |
Merge remote-tracking branch 'origin/0.9.14/BlankLines'
# Conflicts:
# core/src/test/kotlin/format/HtmlFormatTest.kt
# core/src/test/kotlin/format/MarkdownFormatTest.kt
Diffstat (limited to 'core/src/main/kotlin/Kotlin')
| -rw-r--r-- | core/src/main/kotlin/Kotlin/ContentBuilder.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Kotlin/ContentBuilder.kt b/core/src/main/kotlin/Kotlin/ContentBuilder.kt index 53afebaf..9c081d17 100644 --- a/core/src/main/kotlin/Kotlin/ContentBuilder.kt +++ b/core/src/main/kotlin/Kotlin/ContentBuilder.kt @@ -148,7 +148,7 @@ fun buildContentTo(tree: MarkdownNode, target: ContentBlock, linkResolver: (Stri private fun MarkdownNode.getLabelText() = children.filter { it.type == MarkdownTokenTypes.TEXT || it.type == MarkdownTokenTypes.EMPH }.joinToString("") { it.text } -private fun keepWhitespace(node: ContentNode) = node is ContentParagraph || node is ContentSection +private fun keepWhitespace(node: ContentNode) = node is ContentParagraph || node is ContentSection || node is ContentBlockCode fun buildInlineContentTo(tree: MarkdownNode, target: ContentBlock, linkResolver: (String) -> ContentBlock) { val inlineContent = tree.children.singleOrNull { it.type == MarkdownElementTypes.PARAGRAPH }?.children ?: listOf(tree) |