diff options
| author | Andrzej Ratajczak <andrzej.ratajczak98@gmail.com> | 2020-06-25 14:22:28 +0200 |
|---|---|---|
| committer | Sebastian Sellmair <34319766+sellmair@users.noreply.github.com> | 2020-06-25 14:56:46 +0200 |
| commit | 973d63bc2d4f5ac912e7c78f019c6689b3acbdc3 (patch) | |
| tree | 3be1ac66c5370a3d64c947d6aa9d6c0ae7b1399e /plugins/kotlin-as-java/src | |
| parent | 583ece7448baedf17a2db5bad6af42d954c0f607 (diff) | |
| download | dokka-973d63bc2d4f5ac912e7c78f019c6689b3acbdc3.tar.gz dokka-973d63bc2d4f5ac912e7c78f019c6689b3acbdc3.tar.bz2 dokka-973d63bc2d4f5ac912e7c78f019c6689b3acbdc3.zip | |
Fixed requested changes
Diffstat (limited to 'plugins/kotlin-as-java/src')
| -rw-r--r-- | plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt | 10 | ||||
| -rw-r--r-- | plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt | 2 |
2 files changed, 6 insertions, 6 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 ed273e5c..c6fcb9b0 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt @@ -39,7 +39,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge contentBuilder.contentFor( e, ContentKind.Symbol, - setOf(TextStyle.Monospace) + e.stylesForDeprecated(it), + setOf(TextStyle.Monospace) + e.stylesIfDeprecated(it), sourceSets = setOf(it) ) { link(e.name, e.dri) @@ -51,7 +51,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge contentBuilder.contentFor( c, ContentKind.Symbol, - setOf(TextStyle.Monospace) + ((c as? WithExtraProperties<out Documentable>)?.stylesForDeprecated(it) + setOf(TextStyle.Monospace) + ((c as? WithExtraProperties<out Documentable>)?.stylesIfDeprecated(it) ?: emptySet()), sourceSets = setOf(it) ) { @@ -90,7 +90,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge contentBuilder.contentFor( p, ContentKind.Symbol, - setOf(TextStyle.Monospace, TextStyle.Block) + p.stylesForDeprecated(it), + setOf(TextStyle.Monospace, TextStyle.Block) + p.stylesIfDeprecated(it), sourceSets = setOf(it) ) { annotationsBlock(p) @@ -108,7 +108,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge contentBuilder.contentFor( f, ContentKind.Symbol, - setOf(TextStyle.Monospace, TextStyle.Block) + f.stylesForDeprecated(it), + setOf(TextStyle.Monospace, TextStyle.Block) + f.stylesIfDeprecated(it), sourceSets = setOf(it) ) { annotationsBlock(f) @@ -134,7 +134,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge private fun signature(t: DTypeParameter) = t.sourceSets.map { - contentBuilder.contentFor(t, styles = t.stylesForDeprecated(it), sourceSets = setOf(it)) { + contentBuilder.contentFor(t, styles = t.stylesIfDeprecated(it), sourceSets = setOf(it)) { text(t.name.substringAfterLast(".")) list(t.bounds, prefix = " extends ") { signatureForProjection(it) diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt index b4245834..ecb97617 100644 --- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt +++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureUtils.kt @@ -9,7 +9,7 @@ import org.jetbrains.dokka.model.properties.WithExtraProperties object JavaSignatureUtils : JvmSignatureUtils { - val ignoredAnnotations = setOf( + private val ignoredAnnotations = setOf( Annotations.Annotation(DRI("kotlin.jvm", "Transient"), emptyMap()), Annotations.Annotation(DRI("kotlin.jvm", "Volatile"), emptyMap()), Annotations.Annotation(DRI("kotlin.jvm", "Transitive"), emptyMap()), |