diff options
| author | Marcin Aman <marcin.aman@gmail.com> | 2021-08-27 17:07:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 17:07:18 +0200 |
| commit | 9518bf22eb14076c53e8d1b3bc45fe8b07e10da5 (patch) | |
| tree | 6167d4b1b1d8ba565ac2ab316f0108ad592a0e26 /plugins/kotlin-as-java | |
| parent | a3997262b7c7382549cd7f3b50dfd9cb63b277b0 (diff) | |
| parent | fb6822793252cb2957ae0f0c2ed36aafebcf12f4 (diff) | |
| download | dokka-9518bf22eb14076c53e8d1b3bc45fe8b07e10da5.tar.gz dokka-9518bf22eb14076c53e8d1b3bc45fe8b07e10da5.tar.bz2 dokka-9518bf22eb14076c53e8d1b3bc45fe8b07e10da5.zip | |
Merge pull request #2095 from Kotlin/bump-compiler-1.5.30
Bump compiler to 1.5.30
Diffstat (limited to 'plugins/kotlin-as-java')
| -rw-r--r-- | plugins/kotlin-as-java/src/main/kotlin/jvmField.kt | 2 | ||||
| -rw-r--r-- | plugins/kotlin-as-java/src/main/kotlin/jvmName.kt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/kotlin-as-java/src/main/kotlin/jvmField.kt b/plugins/kotlin-as-java/src/main/kotlin/jvmField.kt index 9a66eb27..b421bd3d 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/jvmField.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/jvmField.kt @@ -3,7 +3,7 @@ package org.jetbrains.dokka.kotlinAsJava import org.jetbrains.dokka.model.Annotations import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.properties.WithExtraProperties -import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult +import org.jetbrains.kotlin.util.firstNotNullResult internal fun WithExtraProperties<out Documentable>.jvmField(): Annotations.Annotation? = extra[Annotations]?.directAnnotations?.entries?.firstNotNullResult { (_, annotations) -> annotations.jvmFieldAnnotation() } diff --git a/plugins/kotlin-as-java/src/main/kotlin/jvmName.kt b/plugins/kotlin-as-java/src/main/kotlin/jvmName.kt index c81210d6..44271f2c 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/jvmName.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/jvmName.kt @@ -5,10 +5,10 @@ import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.StringValue import org.jetbrains.dokka.model.isJvmName import org.jetbrains.dokka.model.properties.WithExtraProperties -import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult +import org.jetbrains.kotlin.util.firstNotNullResult internal fun WithExtraProperties<out Documentable>.directlyAnnotatedJvmName(): Annotations.Annotation? = - extra[Annotations]?.directAnnotations?.entries?.firstNotNullResult { (_, annotations) -> annotations.jvmNameAnnotation() } + extra[Annotations]?.directAnnotations?.entries?.firstNotNullResult { (_, annotations)-> annotations.jvmNameAnnotation() } internal fun WithExtraProperties<out Documentable>.fileLevelJvmName(): Annotations.Annotation? = extra[Annotations]?.fileLevelAnnotations?.entries?.firstNotNullResult { (_, annotations) -> annotations.jvmNameAnnotation() } |