aboutsummaryrefslogtreecommitdiff
path: root/plugins/base/src/main/kotlin
diff options
context:
space:
mode:
authorFilip Zybała <fzybala@virtuslab.com>2020-07-09 16:19:45 +0200
committerPaweł Marks <Kordyjan@users.noreply.github.com>2020-07-10 15:54:14 +0200
commitb4df6de11f8f23e69e57db55f2e05b81466f6d1f (patch)
tree304d89247ebfd403f681f706473a1c461154bbeb /plugins/base/src/main/kotlin
parent8ff94d7125f9ed68a1787494bec11b034b7e55aa (diff)
downloaddokka-b4df6de11f8f23e69e57db55f2e05b81466f6d1f.tar.gz
dokka-b4df6de11f8f23e69e57db55f2e05b81466f6d1f.tar.bz2
dokka-b4df6de11f8f23e69e57db55f2e05b81466f6d1f.zip
Bugfix: links in documentation attached to module page should now be correct
Diffstat (limited to 'plugins/base/src/main/kotlin')
-rw-r--r--plugins/base/src/main/kotlin/parsers/MarkdownParser.kt3
-rw-r--r--plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt3
2 files changed, 5 insertions, 1 deletions
diff --git a/plugins/base/src/main/kotlin/parsers/MarkdownParser.kt b/plugins/base/src/main/kotlin/parsers/MarkdownParser.kt
index 6075ef73..36005d14 100644
--- a/plugins/base/src/main/kotlin/parsers/MarkdownParser.kt
+++ b/plugins/base/src/main/kotlin/parsers/MarkdownParser.kt
@@ -124,6 +124,9 @@ class MarkdownParser(
null
}
}
+ }.also {
+ if (it == null)
+ logger.warn("Couldn't resolve link for $mdLink")
}
private fun referenceLinksHandler(node: ASTNode): DocTag {
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
index a0800da8..4a98a5e0 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/ModuleAndPackageDocumentationTransformer.kt
@@ -8,6 +8,7 @@ import org.jetbrains.dokka.base.parsers.MarkdownParser
import org.jetbrains.dokka.plugability.DokkaContext
import org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer
import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
import java.nio.file.Files
import java.nio.file.Paths
@@ -60,7 +61,7 @@ internal class ModuleAndPackageDocumentationTransformer(
doc?.get("Module")?.get(module.name)?.run {
pd to MarkdownParser(
facade,
- facade.moduleDescriptor,
+ facade.moduleDescriptor.getPackage(FqName.topLevel(Name.identifier(""))),
context.logger
).parse(this)
}