From 39b64feead5718ae9d3e4293407cf0858057493a Mon Sep 17 00:00:00 2001 From: Błażej Kardyś Date: Fri, 21 Aug 2020 15:26:17 +0200 Subject: Adding missing deprecated exception section to Deprecated page --- .../kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt | 1 + .../kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'plugins/javadoc/src/main/kotlin/org') diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt index de07b730..feedc493 100644 --- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt +++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/JavadocPageNodes.kt @@ -319,6 +319,7 @@ enum class DeprecatedPageSection(val id: String, val caption: String, val header DeprecatedInterfaces("interface", "Interfaces", "Interface"), DeprecatedClasses("class", "Classes", "Class"), DeprecatedEnums("enum", "Enums", "Enum"), + DeprecatedExceptions("exception", "Exceptions", "Exceptions"), DeprecatedFields("field", "Fields", "Field"), DeprecatedMethods("method", "Methods", "Method"), DeprecatedConstructors("constructor", "Constructors", "Constructor"), diff --git a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt index 418327e6..5d51bc24 100644 --- a/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt +++ b/plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/pages/htmlPreprocessors.kt @@ -3,8 +3,10 @@ package org.jetbrains.dokka.javadoc.pages import org.jetbrains.dokka.base.renderers.sourceSets import org.jetbrains.dokka.base.transformers.documentables.deprecatedAnnotation import org.jetbrains.dokka.base.transformers.documentables.isDeprecated +import org.jetbrains.dokka.base.transformers.documentables.isException import org.jetbrains.dokka.model.Documentable import org.jetbrains.dokka.model.StringValue +import org.jetbrains.dokka.model.WithSupertypes import org.jetbrains.dokka.pages.* import org.jetbrains.dokka.transformers.pages.PageTransformer import kotlin.collections.HashMap @@ -130,7 +132,8 @@ object DeprecatedPageCreator : PageTransformer { node.properties.forEach { it.takeIf { it.isDeprecated() }?.putAs(DeprecatedPageSection.DeprecatedFields) } node.entries.forEach { it.takeIf { it.isDeprecated() }?.putAs(DeprecatedPageSection.DeprecatedEnumConstants) } node.takeIf { it.isDeprecated() }?.putAs( - when (node.kind) { + if ((node.documentable as? WithSupertypes)?.isException == true) DeprecatedPageSection.DeprecatedExceptions + else when (node.kind) { "enum" -> DeprecatedPageSection.DeprecatedEnums "interface" -> DeprecatedPageSection.DeprecatedInterfaces else -> DeprecatedPageSection.DeprecatedClasses -- cgit