aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/Generation
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2019-10-04 00:05:56 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2019-10-04 00:05:56 +0300
commitde2f32d91fb6f564826ddd7644940452356e2080 (patch)
tree0add9a228d498e19279500c37a20c62ef224cec2 /core/src/main/kotlin/Generation
parent06fb0d88cd096ce287cc63fd37035ad77e2b58e2 (diff)
parenta28db3c1a618ce4b413c7315e8b0a9f43b6ade4a (diff)
downloaddokka-de2f32d91fb6f564826ddd7644940452356e2080.tar.gz
dokka-de2f32d91fb6f564826ddd7644940452356e2080.tar.bz2
dokka-de2f32d91fb6f564826ddd7644940452356e2080.zip
Merge remote-tracking branch 'origin/multiplatform-support' into tmp--release--0.10.0
Diffstat (limited to 'core/src/main/kotlin/Generation')
-rw-r--r--core/src/main/kotlin/Generation/DocumentationMerger.kt8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Generation/DocumentationMerger.kt b/core/src/main/kotlin/Generation/DocumentationMerger.kt
index 5d53868a..53dc23a9 100644
--- a/core/src/main/kotlin/Generation/DocumentationMerger.kt
+++ b/core/src/main/kotlin/Generation/DocumentationMerger.kt
@@ -164,7 +164,13 @@ class DocumentationMerger(
if (groupNode.kind == NodeKind.ExternalClass){
val refs = nodes.flatMap { it.allReferences() }.filter { it.kind != RefKind.Owner && it.kind != RefKind.TopLevelPage }
- refs.forEach { it.to.append(groupNode, RefKind.TopLevelPage); groupNode.append(it.to, RefKind.Member) }
+ refs.forEach {
+ if (it.kind != RefKind.Link) {
+ it.to.dropReferences { ref -> ref.kind == RefKind.Owner }
+ it.to.append(groupNode, RefKind.Owner)
+ }
+ groupNode.append(it.to, it.kind)
+ }
}
// if nodes are classes, nested members should be also merged and