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/base/src/test/kotlin/content | |
| 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/base/src/test/kotlin/content')
| -rw-r--r-- | plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt index c48ddedf..f7f7eb66 100644 --- a/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt +++ b/plugins/base/src/test/kotlin/content/annotations/ContentForAnnotationsTest.kt @@ -1,6 +1,7 @@ package content.annotations import matchers.content.* +import org.jetbrains.dokka.DokkaConfiguration import org.jetbrains.dokka.base.testApi.testRunner.BaseAbstractTest import org.jetbrains.dokka.links.DRI import org.jetbrains.dokka.model.* @@ -8,7 +9,7 @@ import org.jetbrains.dokka.pages.ContentPage import org.jetbrains.dokka.pages.ContentText import org.jetbrains.dokka.pages.MemberPageNode import org.jetbrains.dokka.pages.PackagePageNode -import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult +import org.jetbrains.kotlin.util.firstNotNullResult import org.junit.jupiter.api.Test import utils.ParamAttributes import utils.assertNotNull @@ -221,7 +222,7 @@ class ContentForAnnotationsTest : BaseAbstractTest() { mustBeDocumented = false )) val property = modules.flatMap { it.packages }.flatMap { it.properties }.first() - val annotation = property.extra?.get(Annotations)?.let { + val annotation = property.extra[Annotations]?.let { it.directAnnotations.entries.firstNotNullResult { (_, annotations) -> annotations.firstOrNull() } } val annotationParams = annotation?.params ?: emptyMap() |