From 9bf535bf8c0b758fc0abf99b61208fa5430239d6 Mon Sep 17 00:00:00 2001
From: "sebastian.sellmair" <sebastian.sellmair@jetbrains.com>
Date: Wed, 26 Aug 2020 15:40:23 +0200
Subject: Let `DRI.packageName` always be a real package name for root packages
 ("")

---
 .../src/main/kotlin/org/jetbrains/dokka/analysis/DRIFactory.kt        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kotlin-analysis/src/main/kotlin')

diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DRIFactory.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DRIFactory.kt
index 217a3b7d..e74f9f6a 100644
--- a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DRIFactory.kt
+++ b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/DRIFactory.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 fun DRI.Companion.from(descriptor: DeclarationDescriptor) = descriptor.parentsWithSelf.run {
     val callable = firstIsInstanceOrNull<CallableDescriptor>()
     DRI(
-        firstIsInstanceOrNull<PackageFragmentDescriptor>()?.fqName?.asString(),
+        firstIsInstanceOrNull<PackageFragmentDescriptor>()?.fqName?.asString() ?: "",
         (filterIsInstance<ClassDescriptor>() + filterIsInstance<TypeAliasDescriptor>()).toList()
             .takeIf { it.isNotEmpty() }
             ?.asReversed()
@@ -27,7 +27,7 @@ fun DRI.Companion.from(psi: PsiElement) = psi.parentsWithSelf.run {
     val psiField = firstIsInstanceOrNull<PsiField>()
     val classes = filterIsInstance<PsiClass>().filterNot { it is PsiTypeParameter }.toList() // We only want exact PsiClass types, not PsiTypeParameter subtype
     DRI(
-        classes.lastOrNull()?.qualifiedName?.substringBeforeLast('.', ""),
+        classes.lastOrNull()?.qualifiedName?.substringBeforeLast('.', "") ?: "",
         classes.toList().takeIf { it.isNotEmpty() }?.asReversed()?.mapNotNull { it.name }?.joinToString("."),
         psiMethod?.let { Callable.from(it) } ?: psiField?.let { Callable.from(it) },
         DriTarget.from(psi)
-- 
cgit