Skip to content

Commit 01f040b

Browse files
Merge pull request #13643 from KacperFKorban/scaladoc/better-nested-lists-rendering
Better nested lists rendering in scaladoc
2 parents 3e192a3 + daaa500 commit 01f040b

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

scaladoc/src/dotty/tools/scaladoc/renderers/DocRenderer.scala

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,15 @@ class DocRender(signatureRenderer: SignatureRenderer)(using DocContext):
2020
renderLink(link, default => text(if name.isEmpty then default else name)).toString
2121
))
2222

23-
private def listItems(items: Seq[WikiDocElement]) =
24-
items.map(i => li(renderElement(i)))
23+
private def listItems(items: Seq[WikiDocElement]): Seq[AppliedTag] = items match
24+
case Nil => Nil
25+
case (x :: (y: (UnorderedList | OrderedList)) :: tail) =>
26+
li(
27+
renderElement(x),
28+
renderElement(y)
29+
) +: listItems(tail)
30+
case (x :: tail) =>
31+
li(renderElement(x)) +: listItems(tail)
2532
private def notSupported(name: String, content: AppliedTag): AppliedTag =
2633
report.warning(s"Wiki syntax does not support $name in ${signatureRenderer.currentDri.location}")
2734
content

scaladoc/src/dotty/tools/scaladoc/tasty/comments/Comments.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class WikiCommentParser(repr: Repr)(using DocContext)
211211
private def flatten(b: wiki.Inline): String = b match
212212
case wiki.Text(t) => t
213213
case wiki.Italic(t) => flatten(t)
214-
case wiki.Bold(t) =>flatten(t)
214+
case wiki.Bold(t) => flatten(t)
215215
case wiki.Underline(t) => flatten(t)
216216
case wiki.Superscript(t) => flatten(t)
217217
case wiki.Subscript(t) => flatten(t)

0 commit comments

Comments
 (0)