Skip to content

Commit 19b2a2d

Browse files
committed
Remove duplicated rendering of top level description tags
1 parent 349d841 commit 19b2a2d

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

plugins/base/api/base.api

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,8 @@ public class org/jetbrains/dokka/base/renderers/html/HtmlRenderer : org/jetbrain
351351
public static synthetic fun buildLink$default (Lorg/jetbrains/dokka/base/renderers/html/HtmlRenderer;Lkotlinx/html/FlowContent;Lorg/jetbrains/dokka/links/DRI;Ljava/util/List;Lorg/jetbrains/dokka/pages/PageNode;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
352352
public synthetic fun buildList (Ljava/lang/Object;Lorg/jetbrains/dokka/pages/ContentList;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;)V
353353
public fun buildList (Lkotlinx/html/FlowContent;Lorg/jetbrains/dokka/pages/ContentList;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;)V
354-
public fun buildListItems (Lkotlinx/html/DL;Ljava/util/List;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;)V
355354
public fun buildListItems (Lkotlinx/html/OL;Ljava/util/List;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;)V
356355
public fun buildListItems (Lkotlinx/html/UL;Ljava/util/List;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;)V
357-
public static synthetic fun buildListItems$default (Lorg/jetbrains/dokka/base/renderers/html/HtmlRenderer;Lkotlinx/html/DL;Ljava/util/List;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;ILjava/lang/Object;)V
358356
public static synthetic fun buildListItems$default (Lorg/jetbrains/dokka/base/renderers/html/HtmlRenderer;Lkotlinx/html/OL;Ljava/util/List;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;ILjava/lang/Object;)V
359357
public static synthetic fun buildListItems$default (Lorg/jetbrains/dokka/base/renderers/html/HtmlRenderer;Lkotlinx/html/UL;Ljava/util/List;Lorg/jetbrains/dokka/pages/ContentPage;Ljava/util/Set;ILjava/lang/Object;)V
360358
public synthetic fun buildNavigation (Ljava/lang/Object;Lorg/jetbrains/dokka/pages/PageNode;)V

plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -305,31 +305,13 @@ open class HtmlRenderer(
305305
ol { buildListItems(node.children, pageContext, sourceSetRestriction) }
306306
}
307307
node.hasStyle(ListStyle.DescriptionList) -> {
308-
dl { buildListItems(node.children, pageContext, sourceSetRestriction) }
308+
dl { node.children.forEach { it.build(this, pageContext, sourceSetRestriction) } }
309309
}
310310
else -> {
311311
ul { buildListItems(node.children, pageContext, sourceSetRestriction) }
312312
}
313313
}
314314

315-
open fun DL.buildListItems(
316-
items: List<ContentNode>,
317-
pageContext: ContentPage,
318-
sourceSetRestriction: Set<DisplaySourceSet>? = null
319-
) {
320-
items.forEach {
321-
when {
322-
it.hasStyle(ListStyle.DescriptionTerm) -> dt {
323-
it.build(this@buildListItems, pageContext, sourceSetRestriction)
324-
}
325-
it.hasStyle(ListStyle.DescriptionDetails) -> dd {
326-
it.build(this@buildListItems, pageContext, sourceSetRestriction)
327-
}
328-
else -> it.build(this, pageContext, sourceSetRestriction)
329-
}
330-
}
331-
}
332-
333315
open fun OL.buildListItems(
334316
items: List<ContentNode>,
335317
pageContext: ContentPage,

0 commit comments

Comments
 (0)