diff options
| author | Kamil Doległo <kamilok1965@interia.pl> | 2020-04-06 22:24:30 +0200 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-04-08 17:02:01 +0200 |
| commit | a128cdd43265134a2a2c6b45f5d55b3543a9c794 (patch) | |
| tree | b5ad1118fcef7337f49054e5c92d3114e5af7019 /plugins/base/src/main/kotlin/signatures | |
| parent | 17ac290f4d460961dd5f1970a6bc83eea174efaa (diff) | |
| download | dokka-a128cdd43265134a2a2c6b45f5d55b3543a9c794.tar.gz dokka-a128cdd43265134a2a2c6b45f5d55b3543a9c794.tar.bz2 dokka-a128cdd43265134a2a2c6b45f5d55b3543a9c794.zip | |
Fix unnecessary wrapping of signatures, changes in layout
Diffstat (limited to 'plugins/base/src/main/kotlin/signatures')
| -rw-r--r-- | plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt index ef557eaf..7b35c455 100644 --- a/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt +++ b/plugins/base/src/main/kotlin/signatures/KotlinSignatureProvider.kt @@ -55,9 +55,9 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog private fun regularSignature(c: DClasslike, platformData: Set<PlatformData> = c.platformData.toSet()) = contentBuilder.contentFor(c, ContentKind.Symbol, setOf(TextStyle.Monospace), platformData = platformData) { - platformText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " } + platformText(c.visibility, platformData) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " } if (c is DClass) { - platformText(c.modifier) { + platformText(c.modifier, platformData) { if (c.extra[AdditionalModifiers]?.content?.contains(ExtraModifiers.DATA) == true && it.name == "final") "data " else it.name + " " } @@ -71,16 +71,15 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog } link(c.name!!, c.dri) if (c is DClass) { - val pConstructor = c.constructors.singleOrNull() { it.extra[PrimaryConstructorExtra] != null } + val pConstructor = c.constructors.singleOrNull { it.extra[PrimaryConstructorExtra] != null } list(pConstructor?.parameters.orEmpty(), "(", ")", ",", pConstructor?.platformData.orEmpty().toSet()) { - breakLine() text(it.name ?: "", styles = mainStyles.plus(TextStyle.Bold).plus(TextStyle.Indented)) text(": ") signatureForProjection(it.type) } } if (c is WithSupertypes) { - c.supertypes.map { (p, dris) -> + c.supertypes.filter { it.key in platformData }.map { (p, dris) -> list(dris, prefix = " : ", platformData = setOf(p)) { link(it.sureClassNames, it, platformData = setOf(p)) } @@ -128,7 +127,7 @@ class KotlinSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLog } private fun signature(t: DTypeAlias) = - contentBuilder.contentFor(t, ContentKind.Symbol, setOf(TextStyle.Monospace)) { + contentBuilder.contentFor(t) { t.underlyingType.entries.groupBy({ it.value }, { it.key }).map { (type, platforms) -> +contentBuilder.contentFor( t, |