aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2020-06-26 03:07:35 +0200
committerPaweł Marks <pmarks@virtuslab.com>2020-06-30 18:04:09 +0200
commitf35ebd7d322ee864ca5e183c7dd17a07df074028 (patch)
tree4c614667f2c84f55f2284718689433b0e4a1046f
parent862a23e3561942417a50e15a09a233f364a4a204 (diff)
downloaddokka-f35ebd7d322ee864ca5e183c7dd17a07df074028.tar.gz
dokka-f35ebd7d322ee864ca5e183c7dd17a07df074028.tar.bz2
dokka-f35ebd7d322ee864ca5e183c7dd17a07df074028.zip
Fix primary constructor in signature
-rw-r--r--plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt34
-rw-r--r--plugins/base/src/main/resources/dokka/styles/style.css3
-rw-r--r--plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt5
3 files changed, 21 insertions, 21 deletions
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
index 5a497878..493aa403 100644
--- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
+++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt
@@ -159,22 +159,24 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog
}
if (c is WithConstructors) {
val pConstructor = c.constructors.singleOrNull { it.extra[PrimaryConstructorExtra] != null }
- if (pConstructor?.annotations()?.values?.any { it.isNotEmpty() } == true) {
- text(nbsp.toString())
- annotationsInline(pConstructor)
- text("constructor")
- }
- list(
- pConstructor?.parameters.orEmpty(),
- "(",
- ")",
- ",",
- pConstructor?.sourceSets.orEmpty().toSet()
- ) {
- annotationsInline(it)
- text(it.name ?: "", styles = mainStyles.plus(TextStyle.Bold))
- text(": ")
- signatureForProjection(it.type)
+ if (pConstructor?.sourceSets?.contains(sourceSet) == true) {
+ if (pConstructor.annotations().values.any { it.isNotEmpty() }) {
+ text(nbsp.toString())
+ annotationsInline(pConstructor)
+ text("constructor")
+ }
+ list(
+ pConstructor.parameters,
+ "(",
+ ")",
+ ",",
+ pConstructor.sourceSets.toSet()
+ ) {
+ annotationsInline(it)
+ text(it.name ?: "", styles = mainStyles.plus(TextStyle.Bold))
+ text(": ")
+ signatureForProjection(it.type)
+ }
}
}
if (c is WithSupertypes) {
diff --git a/plugins/base/src/main/resources/dokka/styles/style.css b/plugins/base/src/main/resources/dokka/styles/style.css
index 1ccd9cbc..f599ffee 100644
--- a/plugins/base/src/main/resources/dokka/styles/style.css
+++ b/plugins/base/src/main/resources/dokka/styles/style.css
@@ -821,8 +821,7 @@ td.content {
}
.brief-with-platform-tags {
- display: flex;
- flex-direction: column;
+ display: inline-block;
width: 100%;
}
diff --git a/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt b/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
index 05c408ab..d203025b 100644
--- a/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
+++ b/plugins/base/src/test/kotlin/content/signatures/SkippingParenthesisForConstructorsTest.kt
@@ -150,8 +150,8 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
|package test
|
|class SomeClass(a: String) {
- | constructor
- |
+ | constructor()
+ |}
""".trimIndent(), testConfiguration
) {
pagesTransformationStage = { module ->
@@ -186,7 +186,6 @@ class ConstructorsSignaturesTest : AbstractCoreTest() {
}
skipAllNotMatching()
}
-
}
}
}