diff options
| author | Filip Zybała <fzybala@virtuslab.com> | 2020-03-24 12:38:22 +0100 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-03-26 12:36:03 +0100 |
| commit | fe232a3f41978f83134f486ed55dad49bfcb0caa (patch) | |
| tree | afda20effb1be76081ebc482e747c8b6267eb993 /plugins/base/src/main/kotlin/transformers | |
| parent | 8a87b5e0bd2eda12f4e44512e3f8856c72e53b3e (diff) | |
| download | dokka-fe232a3f41978f83134f486ed55dad49bfcb0caa.tar.gz dokka-fe232a3f41978f83134f486ed55dad49bfcb0caa.tar.bz2 dokka-fe232a3f41978f83134f486ed55dad49bfcb0caa.zip | |
Signatures are now platform-hinted. Fixed merger after changing modifier to PlatformDependent.
Diffstat (limited to 'plugins/base/src/main/kotlin/transformers')
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt index 48be8ae7..c87b5de3 100644 --- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt +++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt @@ -120,6 +120,7 @@ fun DFunction.mergeWith(other: DFunction): DFunction = copy( documentation = documentation.mergeWith(other.documentation), sources = sources.mergeWith(other.sources), visibility = visibility.mergeWith(other.visibility), + modifier = modifier.mergeWith(other.modifier), platformData = (platformData + other.platformData).distinct(), generics = merge(generics + other.generics, DTypeParameter::mergeWith) ).mergeExtras(this, other) @@ -129,6 +130,7 @@ fun DProperty.mergeWith(other: DProperty): DProperty = copy( documentation = documentation.mergeWith(other.documentation), sources = sources.mergeWith(other.sources), visibility = visibility.mergeWith(other.visibility), + 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 @@ -161,6 +163,7 @@ fun DClass.mergeWith(other: DClass): DClass = copy( classlikes = mergeExpectActual(classlikes + other.classlikes, DClasslike::mergeWith, DClasslike::setPlatformData), companion = companion?.let { c -> other.companion?.let { c.mergeWith(it) } ?: c } ?: other.companion, generics = merge(generics + other.generics, DTypeParameter::mergeWith), + modifier = modifier.mergeWith(other.modifier), supertypes = supertypes.mergeWith(other.supertypes), documentation = documentation.mergeWith(other.documentation), sources = sources.mergeWith(other.sources), |