diff options
| author | Marcin Aman <marcin.aman@gmail.com> | 2021-07-22 14:27:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 14:27:55 +0200 |
| commit | b6dce5370b0c90932127499a903453b199e69c5a (patch) | |
| tree | 3ab1839f794b574f7a97edbc80eb52b64b4cef67 /plugins/javadoc/src/main | |
| parent | 4f701027ac0a5de6c52fb6285edf79752c84ad0e (diff) | |
| download | dokka-b6dce5370b0c90932127499a903453b199e69c5a.tar.gz dokka-b6dce5370b0c90932127499a903453b199e69c5a.tar.bz2 dokka-b6dce5370b0c90932127499a903453b199e69c5a.zip | |
Bump kotlin 1.5.21 (#2031)
* bump kotlin to 1.5.21
* Bump binary compatibility plugin
* update stdlib submodule
* Bump IJ to 202.8194.7
Diffstat (limited to 'plugins/javadoc/src/main')
| -rw-r--r-- | plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/signatures/JavadocSignatureProvider.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/signatures/JavadocSignatureProvider.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/signatures/JavadocSignatureProvider.kt index e8ec0933..4d40b347 100644 --- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/signatures/JavadocSignatureProvider.kt +++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/signatures/JavadocSignatureProvider.kt @@ -95,13 +95,13 @@ class JavadocSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLo } private fun signature(f: DFunction): List<ContentNode> = - javadocSignature(f) { + javadocSignature(f) { sourceSet -> annotations { annotationsBlock(f) } modifiers { - text(f.modifier[it]?.takeIf { it !in ignoredModifiers }?.name?.plus(" ") ?: "") - text(f.modifiers()[it]?.toSignatureString() ?: "") + text(f.modifier[sourceSet]?.takeIf { it !in ignoredModifiers }?.name?.plus(" ") ?: "") + text(f.modifiers()[sourceSet]?.toSignatureString() ?: "") val usedGenerics = if (f.isConstructor) f.generics.filter { f uses it } else f.generics list(usedGenerics, prefix = "<", suffix = "> ") { +buildSignature(it) @@ -113,7 +113,7 @@ class JavadocSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLo text("(") list(f.parameters) { annotationsInline(it) - text(it.modifiers()[it]?.toSignatureString().orEmpty()) + text(it.modifiers()[sourceSet]?.toSignatureString().orEmpty()) signatureForProjection(it.type) text(Typography.nbsp.toString()) text(it.name.orEmpty()) |