aboutsummaryrefslogtreecommitdiff
path: root/plugins/base/src/main/kotlin/translators/descriptors
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2020-04-14 14:14:31 +0200
committerKamil Doległo <kamilok1965@interia.pl>2020-04-15 12:15:04 +0200
commit64e600b126ae8edcfbb3c2716febb01d221520b5 (patch)
tree63e1c32599e1525fed431cb26b10d4d3e7239c49 /plugins/base/src/main/kotlin/translators/descriptors
parentbc843d67b455e484cd05cdf28e5ce5dec68119d4 (diff)
downloaddokka-64e600b126ae8edcfbb3c2716febb01d221520b5.tar.gz
dokka-64e600b126ae8edcfbb3c2716febb01d221520b5.tar.bz2
dokka-64e600b126ae8edcfbb3c2716febb01d221520b5.zip
Fix path clash with top-level declarations, catch link resolving exception, remove default values while merging, merge expect by targets
Diffstat (limited to 'plugins/base/src/main/kotlin/translators/descriptors')
-rw-r--r--plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 0e24fc08..c2f190c2 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -72,7 +72,9 @@ private class DokkaDescriptorVisitor(
descriptor: PackageFragmentDescriptor,
parent: DRIWithPlatformInfo
): DPackage {
- val driWithPlatform = DRI(packageName = descriptor.fqName.asString()).withEmptyInfo()
+ val name = descriptor.fqName.asString().takeUnless { it.isBlank() } ?:
+ "<" + platformData.targets.joinToString(",") + " root>"// TODO: error-prone, find a better way to do it
+ val driWithPlatform = DRI(packageName = name).withEmptyInfo()
val scope = descriptor.getMemberScope()
return DPackage(