aboutsummaryrefslogtreecommitdiff
path: root/plugins/kotlin-as-java
diff options
context:
space:
mode:
authorAndrzej Ratajczak <andrzej.ratajczak98@gmail.com>2020-06-15 14:37:39 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-06-25 14:56:46 +0200
commitd96d46f76ed800de45cade90dedc11ec72a37341 (patch)
tree4346771519250e957a0c344ecf32482170334cee /plugins/kotlin-as-java
parentfa8b850977788339d1ce62cd0e3e87e681071584 (diff)
downloaddokka-d96d46f76ed800de45cade90dedc11ec72a37341.tar.gz
dokka-d96d46f76ed800de45cade90dedc11ec72a37341.tar.bz2
dokka-d96d46f76ed800de45cade90dedc11ec72a37341.zip
Remove platoformText function
Diffstat (limited to 'plugins/kotlin-as-java')
-rw-r--r--plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index ed032694..ed273e5c 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -55,11 +55,11 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
?: emptySet()),
sourceSets = setOf(it)
) {
- sourceSetDependentText(c.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
+ text(c.visibility[it]?.takeIf { it !in ignoredVisibilities }?.name?.plus(" ") ?: "")
if (c is DClass) {
- sourceSetDependentText(c.modifier) { it.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " " }
- sourceSetDependentText(c.modifiers()) { it.toSignatureString() }
+ text(c.modifier[it]?.takeIf { it !in ignoredModifiers }?.name?.plus(" ") ?: "")
+ text(c.modifiers()[it]?.toSignatureString() ?: "")
}
when (c) {
@@ -94,9 +94,9 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
sourceSets = setOf(it)
) {
annotationsBlock(p)
- sourceSetDependentText(p.visibility) { (it.takeIf { it !in ignoredVisibilities }?.name ?: "") + " " }
- sourceSetDependentText(p.modifier) { it.name + " " }
- sourceSetDependentText(p.modifiers()) { it.toSignatureString() }
+ text(p.visibility[it]?.takeIf { it !in ignoredVisibilities }?.name?.plus(" ") ?: "")
+ text(p.modifier[it]?.name + " ")
+ text(p.modifiers()[it]?.toSignatureString() ?: "")
signatureForProjection(p.type)
text(nbsp.toString())
link(p.name, p.dri)
@@ -112,8 +112,8 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
sourceSets = setOf(it)
) {
annotationsBlock(f)
- sourceSetDependentText(f.modifier) { it.takeIf { it !in ignoredModifiers }?.name.orEmpty() + " " }
- sourceSetDependentText(f.modifiers()) { it.toSignatureString() }
+ text(f.modifier[it]?.takeIf { it !in ignoredModifiers }?.name?.plus(" ") ?: "")
+ text(f.modifiers()[it]?.toSignatureString() ?: "")
val returnType = f.type
signatureForProjection(returnType)
text(nbsp.toString())
@@ -123,7 +123,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
}
list(f.parameters, "(", ")") {
annotationsInline(it)
- sourceSetDependentText(it.modifiers()) { it.toSignatureString() }
+ text(it.modifiers()[it]?.toSignatureString() ?: "")
signatureForProjection(it.type)
text(nbsp.toString())
link(it.name!!, it.dri)