aboutsummaryrefslogtreecommitdiff
path: root/plugins/base/src/main/kotlin/translators/descriptors
diff options
context:
space:
mode:
authorBłażej Kardyś <bkardys@virtuslab.com>2020-10-06 04:54:31 +0200
committerBłażej Kardyś <bkardys@virtuslab.com>2020-11-12 11:44:32 +0100
commit7db15c357a417ccd9ff8ad1f90f5aff84eec132f (patch)
tree92e048e9986300eda0d1f2eeaef1aea424d79a30 /plugins/base/src/main/kotlin/translators/descriptors
parent07e43676665bdc009e135b767e6d43c536b413fa (diff)
downloaddokka-7db15c357a417ccd9ff8ad1f90f5aff84eec132f.tar.gz
dokka-7db15c357a417ccd9ff8ad1f90f5aff84eec132f.tar.bz2
dokka-7db15c357a417ccd9ff8ad1f90f5aff84eec132f.zip
Adding function division switch
Diffstat (limited to 'plugins/base/src/main/kotlin/translators/descriptors')
-rw-r--r--plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index f388ee44..4695dac5 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -405,6 +405,7 @@ private class DokkaDescriptorVisitor(
): DProperty {
val dri = parent.dri.copy(callable = Callable.from(originalDescriptor))
val descriptor = originalDescriptor.getConcreteDescriptor()
+ val inheritedFrom = descriptor.createDRI().let { (originalDri, _) -> originalDri.takeIf { it != dri } }
val isExpect = descriptor.isExpect
val isActual = descriptor.isActual
@@ -438,7 +439,8 @@ private class DokkaDescriptorVisitor(
(descriptor.additionalExtras() + descriptor.getAnnotationsWithBackingField()
.toAdditionalExtras()).toSet().toSourceSetDependent().toAdditionalModifiers(),
descriptor.getAnnotationsWithBackingField().toSourceSetDependent().toAnnotations(),
- descriptor.getDefaultValue()?.let { DefaultValue(it) }
+ descriptor.getDefaultValue()?.let { DefaultValue(it) },
+ InheritedMember(inheritedFrom.toSourceSetDependent()),
))
)
}
@@ -484,7 +486,7 @@ private class DokkaDescriptorVisitor(
sourceSets = setOf(sourceSet),
isExpectActual = (isExpect || isActual),
extra = PropertyContainer.withAll(
- InheritedFunction(inheritedFrom.toSourceSetDependent()),
+ InheritedMember(inheritedFrom.toSourceSetDependent()),
descriptor.additionalExtras().toSourceSetDependent().toAdditionalModifiers(),
descriptor.getAnnotations().toSourceSetDependent().toAnnotations()
)