diff options
| author | Błażej Kardyś <bkardys@virtuslab.com> | 2020-11-16 19:46:31 +0100 |
|---|---|---|
| committer | Błażej Kardyś <bkardys@virtuslab.com> | 2020-11-27 03:15:02 +0100 |
| commit | 076a5f421c5e4621539efd814be612f43fef33f5 (patch) | |
| tree | 90b399c459cccbd1e3010778320d49b7b806b1fb /plugins/base/src/main/kotlin | |
| parent | c203be9fb65ee221875b4e1c865bcd289a85e69c (diff) | |
| download | dokka-076a5f421c5e4621539efd814be612f43fef33f5.tar.gz dokka-076a5f421c5e4621539efd814be612f43fef33f5.tar.bz2 dokka-076a5f421c5e4621539efd814be612f43fef33f5.zip | |
Adding inter-module link resolving template strategy for Gfm
Diffstat (limited to 'plugins/base/src/main/kotlin')
| -rw-r--r-- | plugins/base/src/main/kotlin/DokkaBase.kt | 3 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt | 2 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/templating/ResolveLinkCommand.kt | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/base/src/main/kotlin/DokkaBase.kt b/plugins/base/src/main/kotlin/DokkaBase.kt index ac070ab4..c4dacdcd 100644 --- a/plugins/base/src/main/kotlin/DokkaBase.kt +++ b/plugins/base/src/main/kotlin/DokkaBase.kt @@ -32,7 +32,8 @@ import org.jetbrains.dokka.plugability.DokkaPlugin import org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer import org.jetbrains.dokka.transformers.pages.PageTransformer -class DokkaBase : DokkaPlugin() { +class +DokkaBase : DokkaPlugin() { val preMergeDocumentableTransformer by extensionPoint<PreMergeDocumentableTransformer>() val pageMergerStrategy by extensionPoint<PageMergerStrategy>() diff --git a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt index 182ecbc6..d76ba597 100644 --- a/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt +++ b/plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt @@ -104,7 +104,7 @@ abstract class DefaultRenderer<T>( pageContext: ContentPage, sourceSetRestriction: Set<DisplaySourceSet>? = null ) { - if (sourceSetRestriction == null || node.sourceSets.any { it in sourceSetRestriction }) { + if (sourceSetRestriction.isNullOrEmpty() || node.sourceSets.any { it in sourceSetRestriction }) { when (node) { is ContentText -> buildText(node) is ContentHeader -> buildHeader(node, pageContext, sourceSetRestriction) diff --git a/plugins/base/src/main/kotlin/templating/ResolveLinkCommand.kt b/plugins/base/src/main/kotlin/templating/ResolveLinkCommand.kt index 83b7e0d8..1cc3e773 100644 --- a/plugins/base/src/main/kotlin/templating/ResolveLinkCommand.kt +++ b/plugins/base/src/main/kotlin/templating/ResolveLinkCommand.kt @@ -1,6 +1,5 @@ package org.jetbrains.dokka.base.templating -import com.fasterxml.jackson.annotation.JsonTypeInfo import org.jetbrains.dokka.links.DRI class ResolveLinkCommand(val dri: DRI): Command |