diff options
| author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-07-14 19:22:17 +0200 |
|---|---|---|
| committer | Sebastian Sellmair <34319766+sellmair@users.noreply.github.com> | 2020-07-15 16:01:44 +0200 |
| commit | dcd4c1c5bc13e7bb058bcd055aa2b02d7d39e9c1 (patch) | |
| tree | 7ff9003f55c5890ca5e7d47a0f2adc58ee363201 /plugins/base/src/main/kotlin/transformers/pages | |
| parent | ac19f61e253e9d168898fe3a0f64221b697ad8be (diff) | |
| download | dokka-dcd4c1c5bc13e7bb058bcd055aa2b02d7d39e9c1.tar.gz dokka-dcd4c1c5bc13e7bb058bcd055aa2b02d7d39e9c1.tar.bz2 dokka-dcd4c1c5bc13e7bb058bcd055aa2b02d7d39e9c1.zip | |
Fix presenting inline code in KDoc
Diffstat (limited to 'plugins/base/src/main/kotlin/transformers/pages')
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt | 15 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt | 7 |
2 files changed, 16 insertions, 6 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 1770dc6f..19817992 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/comments/DocTagToContentConverter.kt @@ -91,7 +91,7 @@ object DocTagToContentConverter : CommentsToContentConverter { ) ) is BlockQuote -> listOf( - ContentCode( + ContentCodeBlock( buildChildren(docTag), "", dci, @@ -99,8 +99,17 @@ object DocTagToContentConverter : CommentsToContentConverter { styles ) ) - is Code -> listOf( - ContentCode( + is CodeInline -> listOf( + ContentCodeInline( + buildChildren(docTag), + "", + dci, + sourceSets, + styles + ) + ) + is CodeBlock -> listOf( + ContentCodeBlock( buildChildren(docTag), "", dci, diff --git a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt index 41dea1a2..695ef050 100644 --- a/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt +++ b/plugins/base/src/main/kotlin/transformers/pages/samples/SamplesTransformer.kt @@ -86,7 +86,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer { | //sampleEnd |}""".trimMargin() - private fun ContentNode.dfs(fqName: String, node: ContentCode): ContentNode { + private fun ContentNode.dfs(fqName: String, node: ContentCodeBlock): ContentNode { return when (this) { is ContentHeader -> copy(children.map { it.dfs(fqName, node) }) is ContentDivergentGroup -> @Suppress("UNCHECKED_CAST") copy(children.map { @@ -96,7 +96,8 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer { before.let { it?.dfs(fqName, node) }, divergent.dfs(fqName, node), after.let { it?.dfs(fqName, node) }) - is ContentCode -> copy(children.map { it.dfs(fqName, node) }) + is ContentCodeBlock -> copy(children.map { it.dfs(fqName, node) }) + is ContentCodeInline -> copy(children.map { it.dfs(fqName, node) }) is ContentDRILink -> copy(children.map { it.dfs(fqName, node) }) is ContentResolvedLink -> copy(children.map { it.dfs(fqName, node) }) is ContentEmbeddedResource -> copy(children.map { it.dfs(fqName, node) }) @@ -131,7 +132,7 @@ abstract class SamplesTransformer(val context: DokkaContext) : PageTransformer { styles: Set<Style> = emptySet(), extra: PropertyContainer<ContentNode> = PropertyContainer.empty() ) = - ContentCode( + ContentCodeBlock( children = listOf( ContentText( text = content, |