From 076a5f421c5e4621539efd814be612f43fef33f5 Mon Sep 17 00:00:00 2001
From: Błażej Kardyś <bkardys@virtuslab.com>
Date: Mon, 16 Nov 2020 19:46:31 +0100
Subject: Adding inter-module link resolving template strategy for Gfm

---
 plugins/base/src/main/kotlin/DokkaBase.kt                     | 3 ++-
 plugins/base/src/main/kotlin/renderers/DefaultRenderer.kt     | 2 +-
 plugins/base/src/main/kotlin/templating/ResolveLinkCommand.kt | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/base/src')

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
-- 
cgit