Add package recognition when searching.

Author: Lucas Leblanc

scaladoc-js/main/src/searchbar/engine/PageSearchEngine.scala

@@ -71,20 +71,36 @@ class PageSearchEngine(pages: List[PageEntry]):
  pages.map(prematchPage(_, search)).filter(_.indices.nonEmpty)
 
  private def prematchPage(page: PageEntry, search: String): MatchResult =
+ val pagePackage = page.description
  val pageName = page.shortName
+ val fullQualified = if page.description != "" then
+ page.description + "." + pageName
+ else pageName
+
  @tailrec
- def prematchPageAcc(nameIndex: Int, searchIndex: Int, acc: Set[Int], scoreAcc: Int, consecutiveMatches: Int): MatchResult =
+ def prematchPageAcc(nameIndex: Int, searchIndex: Int, fullIndex: Int, acc: Set[Int], scoreAcc: Int, consecutiveMatches: Int): MatchResult =
+ println(s"pageName = $pageName, pagePackage = $pagePackage, fullQualified = $fullQualified")
+ println(s"searchIndex = $searchIndex, searchLength = ${search.length}, nameIndex = $nameIndex, pageLength = ${pageName.length}, fullIndex = $fullIndex, fullLength = ${fullQualified.length}, score = $scoreAcc, consecutiveMatches = $consecutiveMatches")
  if searchIndex >= search.length then
+ println("First IF")
  MatchResult(scoreAcc, page, acc)
- else if nameIndex >= pageName.length then
- MatchResult(0, page, Set.empty)
+ else if nameIndex >= pageName.length || fullIndex >= fullQualified.length then
+ println("Second IF")
+ MatchResult(0, page, Set.empty)
+ else if search.contains(".") && fullQualified(fullIndex).toLower == search(searchIndex).toLower then
+ println("Third IF")
+ val score = (if consecutiveMatches > 0 then 1 else 0) + positionScores(nameIndex)
+ prematchPageAcc(nameIndex, searchIndex + 1, fullIndex + 1, acc + nameIndex, scoreAcc + score, consecutiveMatches + 1)
  else if pageName(nameIndex).toLower == search(searchIndex).toLower then
+ println("Fourth IF")
  val score = (if consecutiveMatches > 0 then 1 else 0) + positionScores(nameIndex)
- prematchPageAcc(nameIndex + 1, searchIndex + 1, acc + nameIndex, scoreAcc + score, consecutiveMatches + 1)
+ prematchPageAcc(nameIndex + 1, searchIndex + 1, fullIndex, acc + nameIndex, scoreAcc + score, consecutiveMatches + 1)
  else
- prematchPageAcc(nameIndex + 1, searchIndex, acc, scoreAcc, 0)
+ println("Else")
+ prematchPageAcc(nameIndex + 1, searchIndex, fullIndex + 1, acc, scoreAcc, 0)
 
- val result = prematchPageAcc(0, 0, Set.empty, 0, 0)
+ println("Calling prematchPageAcc")
+ val result = prematchPageAcc(0, 0, 0, Set.empty, 0, 0)
  result.copy(score = result.score + kindScoreBonus(page.kind))
 
  private def matchPage(prematched: MatchResult, nameSearch: String): MatchResult =