From 69eefa767ccf692297cbdb9dc44240a4fa67aa3c Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Wed, 13 Mar 2019 16:30:07 +0300
Subject: Fix nullability annotations in javadoc

 #446 fixed
---
 core/src/main/kotlin/Model/DocumentationNode.kt | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'core/src/main/kotlin/Model')

diff --git a/core/src/main/kotlin/Model/DocumentationNode.kt b/core/src/main/kotlin/Model/DocumentationNode.kt
index a3388031..ad7801f2 100644
--- a/core/src/main/kotlin/Model/DocumentationNode.kt
+++ b/core/src/main/kotlin/Model/DocumentationNode.kt
@@ -179,17 +179,20 @@ val DocumentationNode.path: List<DocumentationNode>
     }
 
 fun findOrCreatePackageNode(module: DocumentationNode?, packageName: String, packageContent: Map<String, Content>, refGraph: NodeReferenceGraph): DocumentationNode {
-    val existingNode = refGraph.lookup(packageName)
-    if (existingNode != null) {
-        return existingNode
-    }
-    val newNode = DocumentationNode(packageName,
+    val node = refGraph.lookup(packageName)  ?: run {
+        val newNode = DocumentationNode(
+            packageName,
             packageContent.getOrElse(packageName) { Content.Empty },
-            NodeKind.Package)
+            NodeKind.Package
+        )
 
-    refGraph.register(packageName, newNode)
-    module?.append(newNode, RefKind.Member)
-    return newNode
+        refGraph.register(packageName, newNode)
+        newNode
+    }
+    if (module != null && node !in module.members) {
+        module.append(node, RefKind.Member)
+    }
+    return node
 }
 
 fun DocumentationNode.append(child: DocumentationNode, kind: RefKind) {
@@ -215,7 +218,7 @@ fun DocumentationNode.qualifiedName(): String {
     } else if (kind == NodeKind.Package) {
         return name
     }
-    return path.drop(1).map { it.name }.filter { it.length > 0 }.joinToString(".")
+    return path.dropWhile { it.kind == NodeKind.Module }.map { it.name }.filter { it.isNotEmpty() }.joinToString(".")
 }
 
 fun DocumentationNode.simpleName() = name.substringAfterLast('.')
-- 
cgit