Change requests

Author: pikinier20

scala3doc-js/src/Main.scala

@@ -1,7 +1,5 @@
 package dotty.dokka
 
 object Main extends App {
-  def initializeSearchbar(): Unit = Searchbar()
-
-  initializeSearchbar()
+  Searchbar()
 }

scala3doc-js/src/searchbar/PageEntry.scala

@@ -15,15 +15,18 @@ case class PageEntry(
   description: String,
   location: String,
   shortName: String,
-  acronym: Option[String],
+  acronym: Option[String]
 )
 
 object PageEntry {
+  private def createAcronym(s: String): Option[String] =
+    s.headOption.map(firstLetter => firstLetter.toString ++ s.tail.filter(_.isUpper))
+
   def apply(jsObj: PageEntryJS): PageEntry = PageEntry(
     jsObj.name,
     jsObj.description,
     jsObj.location,
     jsObj.searchKeys.head.toLowerCase,
-    Option.when(jsObj.searchKeys.size > 1)(jsObj.searchKeys.last)
+    createAcronym(jsObj.searchKeys.head)
   )
 }

scala3doc-js/src/searchbar/SearchbarComponent.scala

@@ -4,6 +4,7 @@ import org.scalajs.dom._
 import org.scalajs.dom.html.Input
 
 class SearchbarComponent(val callback: (String) => List[PageEntry]):
+  val resultsChunkSize = 100
   extension (p: PageEntry)
     def toHTML =
       val wrapper = document.createElement("div").asInstanceOf[html.Div]
@@ -28,22 +29,22 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]):
     resultsDiv.scrollTop = 0
     while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
     val fragment = document.createDocumentFragment()
-    result.take(100).foreach(fragment.appendChild)
+    result.take(resultsChunkSize).foreach(fragment.appendChild)
     resultsDiv.appendChild(fragment)
     def loadMoreResults(result: List[raw.HTMLElement]): Unit = {
       resultsDiv.onscroll = (event: Event) => {
           if (resultsDiv.scrollHeight - resultsDiv.scrollTop == resultsDiv.clientHeight)
           {
               val fragment = document.createDocumentFragment()
-              result.take(100).foreach(fragment.appendChild)
+              result.take(resultsChunkSize).foreach(fragment.appendChild)
               resultsDiv.appendChild(fragment)
-              loadMoreResults(result.drop(100))
+              loadMoreResults(result.drop(resultsChunkSize))
           }
       }
     }
-    loadMoreResults(result.drop(100))
+    loadMoreResults(result.drop(resultsChunkSize))
 
-  private val logoClick: html.Div =
+  private val searchIcon: html.Div =
     val span = document.createElement("span").asInstanceOf[html.Span]
     span.innerHTML = """<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><path d="M19.64 18.36l-6.24-6.24a7.52 7.52 0 10-1.28 1.28l6.24 6.24zM7.5 13.4a5.9 5.9 0 115.9-5.9 5.91 5.91 0 01-5.9 5.9z"></path></svg>"""
     span.id = "scala3doc-search"
@@ -87,7 +88,7 @@ class SearchbarComponent(val callback: (String) => List[PageEntry]):
   private val rootDiv: html.Div =
     val element = document.createElement("div").asInstanceOf[html.Div]
     element.addEventListener("mousedown", (e: Event) => e.stopPropagation())
-    logoClick.addEventListener("mousedown", (e: Event) => e.stopPropagation())
+    searchIcon.addEventListener("mousedown", (e: Event) => e.stopPropagation())
     document.body.addEventListener("mousedown", (e: Event) =>
       if (document.body.contains(element)) {
         document.body.removeChild(element)

scala3doc-js/src/searchbar/engine/Matchers.scala

@@ -1,19 +1,23 @@
 package dotty.dokka
 
-enum Matchers(func: (PageEntry) => Int) extends Function1[PageEntry, Int]:
-  export func.apply
-  case ByName(query: String) extends Matchers( (p) => {
-    val nameOption = Option(p.shortName)
-    val acronym = p.acronym
-    //Edge case for empty query string
-    if query == "" then 1
-    else {
-      val results = List(
-        nameOption.filter(_.contains(query.toLowerCase)).fold(-1)(_.size - query.size),
-        acronym.filter(_.contains(query)).fold(-1)(_.size - query.size + 1)
-      )
-      if results.forall(_ == -1) then -1 else results.filter(_ != -1).min
+enum Matchers extends Function1[PageEntry, Int]:
+  case ByName(query: String)
+  case ByKind(kind: String)
+
+  def apply(p: PageEntry): Int = this match {
+    case ByName(query) => {
+      val nameOption = Option(p.shortName)
+      val acronym = p.acronym
+      //Edge case for empty query string
+      if query == "" then 1
+      else {
+        val results = List(
+          nameOption.filter(_.contains(query.toLowerCase)).fold(-1)(_.size - query.size),
+          acronym.filter(_.contains(query)).fold(-1)(_.size - query.size + 1)
+        )
+        if results.forall(_ == -1) then -1 else results.filter(_ != -1).min
+      }
     }
-  })
-  case ByKind(kind: String) extends Matchers((p) => p.fullName.split(" ").headOption.filter(_.equalsIgnoreCase(kind)).fold(-1)(_ => 1))
+    case ByKind(kind) => p.fullName.split(" ").headOption.filter(_.equalsIgnoreCase(kind)).fold(-1)(_ => 1)
+  }
 

scala3doc-js/src/searchbar/engine/SearchbarEngine.scala

@@ -4,6 +4,18 @@ import math.Ordering.Implicits.seqOrdering
 
 class SearchbarEngine(pages: List[PageEntry]) {
   def query(query: List[Matchers]): List[PageEntry] = {
-    pages.map(p => p -> query.map(_(p))).filterNot(_(1).exists(_ < 0)).sortBy(_(1)).map(_(0))
+    pages
+      .map( page =>
+        page -> query.map(matcher => matcher(page))
+      )
+      .filterNot {
+        case (page, matchResults) => matchResults.exists(_ < 0)
+      }
+      .sortBy {
+        case (page, matchResults) => matchResults
+      }
+      .map {
+        case (page, matchResults) => page
+      }
   }
 }

scala3doc/src/dotty/renderers/ScalaSearchbarDataInstaller.scala

@@ -60,11 +60,8 @@ class ScalaSearchbarDataInstaller(val ctx: DokkaContext) extends SearchbarDataIn
     pages.addOne(p.getName + link, PageEntry(p.getName, p.getName, link, ""))
   }
 
-  private def createAcronym(s: String): Option[String] =
-    s.headOption.filter(_.isUpper).map(_ => s.filter(_.isUpper))
-
   override def generatePagesList(): String = {
     val mapper = jacksonObjectMapper()
-    val pagesList = pages.values.map(p => createSearchRecord(p.signature, p.pkg, p.link, (List(p.name) ++ createAcronym(p.name)).asJava)).toList.asJava
+    val pagesList = pages.values.map(p => createSearchRecord(p.signature, p.pkg, p.link, (List(p.name)).asJava)).toList.asJava
     mapper.writeValueAsString(pagesList)
   }