diff options
| author | Szymon Świstun <sswistun@virtuslab.com> | 2020-03-18 14:19:54 +0100 |
|---|---|---|
| committer | Kamil Doległo <kamilok1965@users.noreply.github.com> | 2020-03-18 14:22:56 +0100 |
| commit | 03329b0eb98b309d208839344052633028e00984 (patch) | |
| tree | fb41aef63553562fe48e9ef39f9efe7f5824db71 /plugins/kotlin-as-java/src/main/kotlin | |
| parent | 9ac39176bee7c104ff350f968ee399ac97809ad9 (diff) | |
| download | dokka-03329b0eb98b309d208839344052633028e00984.tar.gz dokka-03329b0eb98b309d208839344052633028e00984.tar.bz2 dokka-03329b0eb98b309d208839344052633028e00984.zip | |
Fix minor bugs and add core tests
Diffstat (limited to 'plugins/kotlin-as-java/src/main/kotlin')
| -rw-r--r-- | plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt index 991ee07d..ce41562b 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt @@ -259,7 +259,7 @@ internal fun ClassId.toDRI(dri: DRI?): DRI = DRI( ) private fun PropertyContainer<out Documentable>.mergeAdditionalModifiers(second: Set<ExtraModifiers>) = - this[AdditionalModifiers.AdditionalKey]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second) + this[AdditionalModifiers]?.squash(AdditionalModifiers(second)) ?: AdditionalModifiers(second) private fun AdditionalModifiers.squash(second: AdditionalModifiers) = AdditionalModifiers(content + second.content) |