Merge pull request #10422 from dotty-staging/doc-wiki-stx-fixes

Scala3doc: quick Wiki syntax fixes

Author: abgruszecki

scala3doc/src/dotty/dokka/tasty/comments/wiki/Converter.scala

@@ -115,18 +115,21 @@ class Converter(val repr: Repr) extends BaseConverter {
 
     case Superscript(i) =>
       def name = inl.getClass.getSimpleName
-      println(s"WARN: not yet supported: $name")
+      println(s"WARN: Wiki syntax tag not yet fully supported: $name")
       emitInline(i)
 
     case Subscript(i) =>
       def name = inl.getClass.getSimpleName
-      println(s"WARN: not yet supported: $name")
+      println(s"WARN: Wiki syntax tag not yet fully supported: $name")
       emitInline(i)
 
-    case _: (RepresentationLink | HtmlTag) =>
-      def name = inl.getClass.getSimpleName
-      println(s"WARN: not yet supported: $name")
-      name // doesn't compile if name is a val
+    case HtmlTag(content) =>
+      emit(dkkd.Html(List(dkk.text(content)).asJava, kt.emptyMap))
+
+    case _: RepresentationLink =>
+      val name = inl.getClass.getSimpleName
+      println(s"WARN: Wiki syntax tag not yet supported: $name")
+      emit(dkk.text(name))
   }
 
   def convertInline(inl: Inline): Seq[dkkd.DocTag] =

scala3doc/src/dotty/dokka/transformers/ScalaCommentToContentConverter.scala

@@ -23,14 +23,19 @@ object ScalaCommentToContentConverter extends DocTagToContentConverter {
         title = docTag.getParams.asScala.get("title")
       ))
       List(res).asJava
-    case h: Html => List(
-      HtmlContentNode(
-        h.getChildren.asScala.collect{case c: Text => c}.head.getBody,
-        dci,
-        sourceSets.asScala.toSet.toDisplay.asScala.toSet,
-        styles.asScala.toSet
-      )
-    ).asJava
+
+    case h: Html =>
+      val children = h.getChildren
+      require(children.size() == 1)
+      require(children.get(0).isInstanceOf[Text])
+      List(
+        HtmlContentNode(
+          children.get(0).asInstanceOf[Text].getBody,
+          dci,
+          sourceSets.asScala.toSet.toDisplay.asScala.toSet,
+          styles.asScala.toSet
+        )
+      ).asJava
     case other => super.buildContent(other, dci, sourceSets, styles, extra)
   }