From 325db20fe29910d6c78c768e51425acc8dad2b58 Mon Sep 17 00:00:00 2001 From: vmishenev Date: Thu, 28 Apr 2022 15:12:52 +0300 Subject: [PATCH] Reformat --- core/src/main/kotlin/model/defaultValues.kt | 2 +- .../main/kotlin/signatures/KotlinSignatureProvider.kt | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/src/main/kotlin/model/defaultValues.kt b/core/src/main/kotlin/model/defaultValues.kt index 50aaafd818..a118eb4da5 100644 --- a/core/src/main/kotlin/model/defaultValues.kt +++ b/core/src/main/kotlin/model/defaultValues.kt @@ -5,7 +5,7 @@ import org.jetbrains.dokka.model.properties.MergeStrategy class DefaultValue(val expression: SourceSetDependent): ExtraProperty { - @Deprecated("Use `expression` property that depends on source set", ReplaceWith("expression.values.first()")) + @Deprecated("Use `expression` property that depends on source set", ReplaceWith("this.expression.values.first()")) val value: Expression get() = expression.values.first() companion object : ExtraProperty.Key { diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt index 071f6bde21..772fb61f58 100644 --- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt +++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt @@ -125,13 +125,13 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog sourceSet: DokkaSourceSet ) { // a default value of parameter can be got from expect source set + // but expect properties cannot have a default value d.extra[DefaultValue]?.expression?.let { it[sourceSet] ?: if (d is DParameter) it[d.expectPresentInSet] else null + }?.let { expr -> + operator(" = ") + highlightValue(expr) } - ?.let { expr -> - operator(" = ") - highlightValue(expr) - } } private fun regularSignature(c: DClasslike, sourceSet: DokkaSourceSet) = @@ -269,7 +269,6 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog link(p.name, p.dri) operator(": ") signatureForProjection(p.type) - // expect properties cannot have a default value defaultValueAssign(p, sourceSet) } }