diff options
| author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2022-06-08 01:15:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 01:15:23 +0300 |
| commit | 8c2a79f39377892be44d752d0958efb9b83f1fce (patch) | |
| tree | 8ee91d4fa05fa31fb82df9ac1639812ff2840d4c /plugins/base/src/main/kotlin/signatures | |
| parent | 2e4121457a0fbae1a216007aee6c84a01be628f5 (diff) | |
| download | dokka-8c2a79f39377892be44d752d0958efb9b83f1fce.tar.gz dokka-8c2a79f39377892be44d752d0958efb9b83f1fce.tar.bz2 dokka-8c2a79f39377892be44d752d0958efb9b83f1fce.zip | |
Support definitely non-nullable types (#2520)
* Support definitely non-nullable types
[Definitely non-nullable types](https://github.com/Kotlin/KEEP/blob/c72601cf35c1e95a541bb4b230edb474a6d1d1a8/proposals/definitely-non-nullable-types.md) are enabled since Kotlin 1.7
Diffstat (limited to 'plugins/base/src/main/kotlin/signatures')
| -rw-r--r-- | plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt | 5 | ||||
| -rw-r--r-- | plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt index 294c1d24..02da3f24 100644 --- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt +++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt @@ -430,6 +430,11 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog signatureForProjection(p.inner, showFullyQualifiedName) operator("?") } + is DefinitelyNonNullable -> group(styles = emptySet()) { + signatureForProjection(p.inner, showFullyQualifiedName) + operator(" & ") + link("Any", DriOfAny) + } is TypeAliased -> signatureForProjection(p.typeAlias) is JavaObject -> { diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt index 0fea9132..381fadf1 100644 --- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt +++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureUtils.kt @@ -39,6 +39,7 @@ object KotlinSignatureUtils : JvmSignatureUtils { is TypeParameter -> dri is TypeConstructor -> dri is Nullable -> inner.driOrNull + is DefinitelyNonNullable -> inner.driOrNull is PrimitiveJavaType -> dri is Void -> DriOfUnit is JavaObject -> DriOfAny @@ -52,6 +53,7 @@ object KotlinSignatureUtils : JvmSignatureUtils { is TypeParameter -> listOf(dri) is TypeConstructor -> listOf(dri) + projections.flatMap { it.drisOfAllNestedBounds } is Nullable -> inner.drisOfAllNestedBounds + is DefinitelyNonNullable -> inner.drisOfAllNestedBounds is PrimitiveJavaType -> listOf(dri) is Void -> listOf(DriOfUnit) is JavaObject -> listOf(DriOfAny) |