diff options
| author | Marcin Aman <maman@virtuslab.com> | 2020-05-05 12:09:39 +0200 |
|---|---|---|
| committer | BarkingBad <32793002+BarkingBad@users.noreply.github.com> | 2020-05-06 12:14:18 +0200 |
| commit | 17ef3207c536a9bd5357336977a0c59efcc8daba (patch) | |
| tree | 7dfcd4e3f524de1ce673d79fab2afacaa007e25c /plugins/base/src/main/kotlin/transformers/documentables | |
| parent | a09cdf52571c9c93ca3244d2fc92577dee3fae24 (diff) | |
| download | dokka-17ef3207c536a9bd5357336977a0c59efcc8daba.tar.gz dokka-17ef3207c536a9bd5357336977a0c59efcc8daba.tar.bz2 dokka-17ef3207c536a9bd5357336977a0c59efcc8daba.zip | |
Receiver for extension property #809
Diffstat (limited to 'plugins/base/src/main/kotlin/transformers/documentables')
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt | 3 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/documentables/DocumentableVisibilityFilter.kt | 1 |
2 files changed, 3 insertions, 1 deletions
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 ) } |