Fix Nil handling for HtmlTags and add some tests to cover that

BarkingBad · BarkingBad · commit 23a512786998 · 2020-10-30T12:17:21.000+01:00
diff --git a/scala3doc/src/dotty/renderers/html.scala b/scala3doc/src/dotty/renderers/html.scala
@@ -14,7 +14,7 @@ object HTML:
     def apply(attrs: AttrArg*)(tags: TagArg*): AppliedTag = {
       val sb = StringBuilder()
       sb.append(s"<$name")
-      attrs.foreach{
+      attrs.filter(_ != Nil).foreach{
         case s: Seq[AppliedAttr] =>
           s.foreach(sb.append(" ").append)
         case e: AppliedAttr =>
diff --git a/scala3doc/test/dotty/dokka/renderers/HtmlTagsTest.scala b/scala3doc/test/dotty/dokka/renderers/HtmlTagsTest.scala
@@ -108,4 +108,90 @@ class HtmlTagsTest {
         val expect = """<html><head><script>some script</script></head><body><h1 style="background-color: blue; color: red;">This is my title</h1><div style="background-color: blue; color: red;"><p class="contentpara first">This is my first paragraph</p><a style="opacity: 0.9;"><p class="contentpara">Goooogle</p></a></div></body></html>"""
         assertEquals(expect, actual)
     }
+
+    @Test
+    def appliedTagAndSeqAppliedTag = {
+        val actual = div(h1("AppliedTag"), Seq(h1("SeqAppliedTag"))).toString
+        val expect = """<div><h1>AppliedTag</h1><h1>SeqAppliedTag</h1></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def stringAndSeqString = {
+        val actual = div("String", Seq("SeqString")).toString
+        val expect = """<div>StringSeqString</div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def mixingAllTagArgs = {
+        val actual = div("String", Seq("SeqString"), h1("AppliedTag"), Seq(h1("SeqAppliedTag")), Seq("SeqString"), h1("AppliedTag")).toString
+        val expect = """<div>StringSeqString<h1>AppliedTag</h1><h1>SeqAppliedTag</h1>SeqString<h1>AppliedTag</h1></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def appliedAttrAndSeqAppliedAttr = {
+        val actual = div(cls := "someClass", Seq(style := "some: style;")).toString
+        val expect = """<div class="someClass" style="some: style;"></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def seqAppliedAttrAndAppliedAttr = {
+        val actual = div(Seq(cls := "someClass"), style := "some: style;").toString
+        val expect = """<div class="someClass" style="some: style;"></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def seqAppliedAttrAndSeqAppliedAttr = {
+        val actual = div(Seq(cls := "someClass"), Seq(style := "some: style;")).toString
+        val expect = """<div class="someClass" style="some: style;"></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def mixingAllTagArgsAndAllAttrArgs = {
+        val actual = div(Seq(cls := "someClass"), id := "myId", Seq(style := "some: style;"))("String", Seq("SeqString"), h1("AppliedTag"), Seq(h1("SeqAppliedTag")), Seq("SeqString"), h1("AppliedTag")).toString
+        val expect = """<div class="someClass" id="myId" style="some: style;">StringSeqString<h1>AppliedTag</h1><h1>SeqAppliedTag</h1>SeqString<h1>AppliedTag</h1></div>"""
+        assertEquals(expect, actual)
+    }
+    
+    @Test
+    def nilTagArg = {
+        val nil: TagArg = Nil
+        val actual = div(nil).toString
+        val expect = """<div></div>"""
+        assertEquals(expect, actual)
+    }   
+
+    @Test
+    def nilAttrArg = {
+        val nil: AttrArg = Nil
+        val actual = div(nil).toString
+        val expect = """<div></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def nilAmongTags = {
+        val actual = div("name", Nil, div("ala")).toString
+        val expect = """<div>name<div>ala</div></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def nilAmongArgs = {
+        val actual = div(cls := "someClass", Nil, style := "some: style;").toString
+        val expect = """<div class="someClass" style="some: style;"></div>"""
+        assertEquals(expect, actual)
+    }
+
+    @Test
+    def nilAmongArgsAndTags = {
+        val actual = div(cls := "someClass", Nil, style := "some: style;")("name", Nil, div("ala")).toString
+        val expect = """<div class="someClass" style="some: style;">name<div>ala</div></div>"""
+        assertEquals(expect, actual)
+    }
 }
