Repair tests. Optimization of sidebar generation

Author: pikinier20

scaladoc/resources/dotty_res/styles/scalastyle.css

@@ -190,34 +190,34 @@ th {
 }
 
 /* divs in sidebar represent entry and its children */
-#sideMenu2 .content {
+#sideMenu2 .ni {
   padding-left: 0.8em;
 }
 
-#sideMenu2 > div {
+#sideMenu2 > .ni {
   padding-left: 0em;
 }
 
-#sideMenu2 .nav-item {
+#sideMenu2 .ni {
   display: none;
 }
 
-#sideMenu2 > .nav-item {
+#sideMenu2 > .ni {
   display: block;
 }
 
-#sideMenu2 .nav-header a:only-child {
+#sideMenu2 .nh a:only-child {
   padding-left: 20px;
 }
 
-#sideMenu2 .nav-header {
+#sideMenu2 .nh {
   display: flex;
   flex-direction: row;
   align-items: center;
   border-radius: 3px;
 }
 
-#sideMenu2 .nav-item.expanded > .content > .nav-item {
+#sideMenu2 .ni.expanded > .ni {
   display: block;
 }
 
@@ -261,13 +261,13 @@ th {
   margin-right: 0.5ex;
 }
 
-#sideMenu2 .nav-header.selected {
+#sideMenu2 .nh.selected {
   background: var(--leftbar-current-bg);
   color: var(--leftbar-current-fg);
   font-weight: bold;
 }
 
-#sideMenu2 .nav-header:hover {
+#sideMenu2 .nh:hover {
   color: var(--leftbar-hover-fg);
   background: var(--leftbar-hover-bg);
   cursor: pointer;
@@ -287,7 +287,7 @@ span.ar::before {
   align-items: center;
   justify-content: center;
 }
-.nav-item.expanded > .nav-header > span.ar::before {
+.ni.expanded > .nh > span.ar::before {
   content: "\e903"; /* arrow down */
 }
 

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

@@ -209,22 +209,22 @@ class HtmlRenderer(rootPackage: Member, val members: Map[DRI, Member])(using ctx
           case _ => Nil
         }
         Seq(
-          span(cls := "nav-header " + attrs.mkString(" "))(
+          span(cls := "nh " + attrs.mkString(" "))(
             if withArrow then Seq(span(cls := "ar")) else Nil,
             a(href := pathToPage(pageLink.dri, nav.link.dri))(icon, span(nav.link.name))
           )
         )
 
       nav.children match
-        case Nil => isSelected -> div(cls := s"nav-item ${if isSelected then "expanded" else ""}")(linkHtml())
+        case Nil => isSelected -> div(cls := s"ni ${if isSelected then "expanded" else ""}")(linkHtml())
         case children =>
           val nested = children.map(renderNested(_))
           val expanded = nested.exists(_._1) || isSelected
           val attr =
-            if expanded || isSelected || toplevel then Seq(cls := "nav-item expanded") else Seq(cls := "nav-item")
+            if expanded || isSelected || toplevel then Seq(cls := "ni expanded") else Seq(cls := "ni")
           (isSelected || expanded) -> div(attr)(
             linkHtml(expanded, true),
-            div(cls := "content")(nested.map(_._2))
+            nested.map(_._2)
           )
 
     renderNested(navigablePage, toplevel = true)._2

scaladoc/test/dotty/tools/scaladoc/BaseHtmlTest.scala

@@ -47,7 +47,7 @@ class BaseHtmlTest:
     def niceMsg(msg: String) = s"$msg in $path (body):\n ${d.html()}:\n"
 
     def assertTextsIn(selector: String, expected: String*) =
-      assertFalse(niceMsg("Selector not found"), d.select(selector).isEmpty)
+      assertFalse(niceMsg(s"Selector not found for '$selector'"), d.select(selector).isEmpty)
       val found = d.select(selector).eachText.asScala
       assertEquals(niceMsg(s"Context does not match for '$selector'"), expected.toList, found.toList)
 

scaladoc/test/dotty/tools/scaladoc/signatures/AbstractMemberSignaturesTest.scala

@@ -33,7 +33,7 @@ class AbstractMembers extends ScaladocTest("abstractmembersignatures"):
       val content = document.select(".documentableList").forEach { elem =>
         val group = elem.select(".groupHeader").eachText.asScala.mkString("")
         elem.select(".documentableElement").forEach { elem =>
-          val modifiers = elem.select(".header .other-modifiers").eachText.asScala.mkString("")
+          val modifiers = elem.select(".header .modifiers").eachText.asScala.mkString("")
           val name = elem.select(".header .documentableName").eachText.asScala.mkString("")
           signatures += group -> (modifiers, name)
         }

scaladoc/test/dotty/tools/scaladoc/site/NavigationTest.scala

@@ -9,16 +9,15 @@ class NavigationTest extends BaseHtmlTest:
 
   def testNavMenu(page: String, topLevel: NavMenuTestEntry)(using ProjectContext): Unit =
     withHtmlFile(page){ content  =>
-      def flatten(l: NavMenuTestEntry): Seq[NavMenuTestEntry] = l +: l.nested.flatMap(flatten)
 
       def test(query: String, el: Seq[NavMenuTestEntry]) =
         content.assertTextsIn(query, el.map(_.name):_*)
         content.assertAttr(query,"href", el.map(_.link):_*)
 
-      test("#sideMenu2 a", flatten(topLevel))
-      test("#sideMenu2>div>div>a", topLevel.nested)
-      test("#sideMenu2>div>div>div>a", topLevel.nested.flatMap(_.nested))
-      test("#sideMenu2>div>div>div>div>a", topLevel.nested.flatMap(_.nested.flatMap(_.nested)))
+      test("#sideMenu2>div>span>a", topLevel :: Nil)
+      test("#sideMenu2>div>div>span>a", topLevel.nested)
+      test("#sideMenu2>div>div>div>span>a", topLevel.nested.flatMap(_.nested))
+      test("#sideMenu2>div>div>div>div>span>a", topLevel.nested.flatMap(_.nested.flatMap(_.nested)))
     }