aboutsummaryrefslogtreecommitdiff
path: root/plugins/kotlin-as-java
diff options
context:
space:
mode:
authorIgnat Beresnev <ignat.beresnev@jetbrains.com>2022-06-17 15:16:03 +0200
committerGitHub <noreply@github.com>2022-06-17 15:16:03 +0200
commit9f67dcf75d3b86fa6e4e352d2cebc4f9e17b8048 (patch)
tree5b30ddf007113d5b3da04390e093dc8023c04c79 /plugins/kotlin-as-java
parentb783439932372e823c36776c53cda5bdc8d0ccae (diff)
downloaddokka-9f67dcf75d3b86fa6e4e352d2cebc4f9e17b8048.tar.gz
dokka-9f67dcf75d3b86fa6e4e352d2cebc4f9e17b8048.tar.bz2
dokka-9f67dcf75d3b86fa6e4e352d2cebc4f9e17b8048.zip
Handle more corner cases for inherited accessors (#2532)
Diffstat (limited to 'plugins/kotlin-as-java')
-rw-r--r--plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt2
-rw-r--r--plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt2
2 files changed, 2 insertions, 2 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 50dbc1cb..cff5b182 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -114,7 +114,7 @@ class JavaSignatureProvider internal constructor(ctcc: CommentsToContentConverte
) {
annotationsBlock(p)
p.visibility[it]?.takeIf { it !in ignoredVisibilities }?.name?.let { keyword("$it ") }
- p.modifier[it]?.name?.let { keyword("$it ") }
+ p.modifier[it]?.takeIf { it !in ignoredModifiers }?.name?.let { keyword("$it ") }
p.modifiers()[it]?.toSignatureString()?.let { keyword(it) }
signatureForProjection(p.type)
text(nbsp.toString())
diff --git a/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt b/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt
index 5916a11c..8b07670f 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/transformers/KotlinAsJavaDocumentableTransformer.kt
@@ -8,4 +8,4 @@ import org.jetbrains.dokka.transformers.documentation.DocumentableTransformer
class KotlinAsJavaDocumentableTransformer : DocumentableTransformer {
override fun invoke(original: DModule, context: DokkaContext): DModule =
original.copy(packages = original.packages.map { it.asJava() })
-} \ No newline at end of file
+}