diff options
| author | Paweł Marks <pmarks@virtuslab.com> | 2020-02-27 10:50:48 +0100 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-02-27 10:51:51 +0100 |
| commit | 16163f30353a6a17d3c038c5ec1f00c5b32f1f80 (patch) | |
| tree | 1fd29ec9bb8ad96030ed98c7fa12c2357abaaabc /plugins/base/src/main/kotlin/transformers | |
| parent | 1b8cc45335798d0b5921b897cf5eb641e55f316d (diff) | |
| download | dokka-16163f30353a6a17d3c038c5ec1f00c5b32f1f80.tar.gz dokka-16163f30353a6a17d3c038c5ec1f00c5b32f1f80.tar.bz2 dokka-16163f30353a6a17d3c038c5ec1f00c5b32f1f80.zip | |
Small adjustments to the new model
Diffstat (limited to 'plugins/base/src/main/kotlin/transformers')
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt | 2 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt index 485aca4c..64363078 100644 --- a/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt +++ b/plugins/base/src/main/kotlin/transformers/documentables/DefaultDocumentableMerger.kt @@ -115,7 +115,7 @@ fun Property.mergeWith(other: Property): Property = copy( actual = actual.mergeWith(other.actual), visibility = visibility.mergeWith(other.visibility), platformData = (platformData + other.platformData).distinct(), - getter = getter.mergeWith(other.getter), + 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 ).mergeExtras(this, other) diff --git a/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt index da06e621..1001ffb3 100644 --- a/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt +++ b/plugins/base/src/main/kotlin/transformers/psi/DefaultPsiToDocumentableTranslator.kt @@ -238,7 +238,6 @@ object DefaultPsiToDocumentableTranslator : PsiToDocumentableTranslator { private fun PsiModifierListOwner.getModifier() = when { hasModifier(JvmModifier.ABSTRACT) -> WithAbstraction.Modifier.Abstract - hasModifier(JvmModifier.STATIC) -> WithAbstraction.Modifier.Static hasModifier(JvmModifier.FINAL) -> WithAbstraction.Modifier.Final else -> null } |