From 17ef3207c536a9bd5357336977a0c59efcc8daba Mon Sep 17 00:00:00 2001
From: Marcin Aman <maman@virtuslab.com>
Date: Tue, 5 May 2020 12:09:39 +0200
Subject: Receiver for extension property #809

---
 .../kotlin/transformers/documentables/DefaultDocumentableMerger.kt     | 3 ++-
 .../kotlin/transformers/documentables/DocumentableVisibilityFilter.kt  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/base/src/main/kotlin/transformers/documentables')

diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
index 4daa4a50..f871cdec 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt
@@ -132,7 +132,8 @@ fun DProperty.mergeWith(other: DProperty): DProperty = copy(
     modifier = modifier.mergeWith(other.modifier),
     platformData = (platformData + other.platformData).distinct(),
     getter = getter?.let { g -> other.getter?.let { g.mergeWith(it) } ?: g } ?: other.getter,
-    setter = setter?.let { s -> other.setter?.let { s.mergeWith(it) } ?: s } ?: other.setter
+    setter = setter?.let { s -> other.setter?.let { s.mergeWith(it) } ?: s } ?: other.setter,
+    generics = merge(generics + other.generics, DTypeParameter::mergeWith)
 ).mergeExtras(this, other)
 
 fun DClasslike.setPlatformData(platformData: List<PlatformData>): DClasslike = when (this) {
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
index 36441426..c261d2dc 100644
--- a/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
+++ b/plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt
@@ -163,6 +163,7 @@ internal object DocumentableVisibilityFilter : PreMergeDocumentableTransformer {
                         getter,
                         modifier,
                         filteredPlatforms,
+                        generics.mapNotNull { it.filter(filteredPlatforms) },
                         extra
                     )
                 }
-- 
cgit