Rebase fixes 1

Author: KacperFKorban

scaladoc-js/src/searchbar/SearchbarComponent.scala

@@ -38,6 +38,10 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch
       wrapper.classList.add("scaladoc-searchbar-result")
       wrapper.classList.add("monospace")
 
+      val icon = document.createElement("span").asInstanceOf[html.Span]
+      icon.classList.add("micon")
+      icon.classList.add(p.kind.take(2))
+
       val resultA = document.createElement("a").asInstanceOf[html.Anchor]
       resultA.href = p.location
       resultA.text = s"${p.fullName}"
@@ -97,12 +101,17 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch
     resultsDiv.scrollTop = 0
     while (resultsDiv.hasChildNodes()) resultsDiv.removeChild(resultsDiv.lastChild)
     val fragment = document.createDocumentFragment()
+    println(s"Searching query: $query")
     parser.parse(query) match {
       case EngineMatchersQuery(matchers) =>
+        println(s"Searching normal query: $query")
         handleNewFluffQuery(matchers)
       case BySignature(signature) =>
+        println(s"Searching inkuire query: $query")
         timeoutHandle = setTimeout(1.second) {
+          println("Timeout activated")
           inkuireEngine.query(query) { (p: PageEntry) =>
+            println(s"Found ${p.fullName}")
             resultsDiv.appendChild(p.toHTMLInkuireHack)
           } { (s: String) =>
             resultsDiv.appendChild(s.toHTMLError)

scaladoc-js/src/searchbar/engine/InkuireJSSearchEngine.scala

@@ -13,15 +13,16 @@ import scala.scalajs.js.URIUtils
 
 class InkuireJSSearchEngine {
 
-  val scriptPath = Globals.pathToRoot + "scripts/"
-  val worker     = new Worker(s"${scriptPath}inkuire-worker.js")
+  val scriptPath     = Globals.pathToRoot + "scripts/"
+  val worker: Worker = new Worker(scriptPath + "inkuire-worker.js")
 
   def dynamicToPageEntry(d: Dynamic): PageEntry = {
     PageEntry(
       d.functionName.asInstanceOf[String],
       d.prettifiedSignature.asInstanceOf[String],
       d.pageLocation.asInstanceOf[String],
       d.functionName.asInstanceOf[String],
+      "def",
       List.empty
     )
   }

scaladoc/resources/dotty_res/scripts/inkuire.js

@@ -46,6 +46,19 @@ object Inkuire {
     isUnresolved: Boolean = false
   )
 
+  object Type {
+    def unresolved: Type =
+      Type(
+        name = TypeName("<unresolved>"),
+        itid = Some(
+          ITID(
+            uuid = "<unresolved>",
+            isParsed = false
+          )
+        )
+      )
+  }
+
   case class TypeName(name: String) {
     override def hashCode(): Int = name.toLowerCase.hashCode
 

scaladoc/src/dotty/tools/scaladoc/Inkuire.scala

@@ -117,8 +117,8 @@ class ScaladocSettings extends SettingGroup with AllScalaSettings:
   val snippetCompilerDebug: Setting[Boolean] =
     BooleanSetting("-Ysnippet-compiler-debug", snippets.SnippetCompilerArgs.debugUsage, false)
 
-  def scaladocSpecificSettings: Set[Setting[_]] =
-    Set(sourceLinks, syntax, revision, externalDocumentationMappings, socialLinks, skipById, skipByRegex, deprecatedSkipPackages, docRootContent, snippetCompiler, snippetCompilerDebug)
-
   val generateInkuire: Setting[Boolean] =
     BooleanSetting("-generate-inkuire", "Generates InkuireDB", false)
+
+  def scaladocSpecificSettings: Set[Setting[_]] =
+    Set(sourceLinks, syntax, revision, externalDocumentationMappings, socialLinks, skipById, skipByRegex, deprecatedSkipPackages, docRootContent, snippetCompiler, snippetCompilerDebug, generateInkuire)

scaladoc/src/dotty/tools/scaladoc/ScaladocSettings.scala

@@ -80,8 +80,7 @@ trait Resources(using ctx: DocContext) extends Locations, Writer:
       "scripts/searchbar.js",
       "scripts/inkuire.js",
       "scripts/inkuire-worker.js",
-      "scripts/inkuire-config.json",
-      "scripts/db.json"
+      "scripts/inkuire-config.json"
     ).map(dottyRes)
 
     val urls = List(

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

@@ -152,8 +152,6 @@ trait ClassLikeSupport:
             uri = methodSymbol.dri.externalLink.getOrElse("")
           )
           Inkuire.db = Inkuire.db.copy(functions = Inkuire.db.functions :+ sgn)
-        case s =>
-          println(s"Inkuire skipping symbol $s")
       }
 
     }

scaladoc/src/dotty/tools/scaladoc/tasty/ClassLikeSupport.scala

@@ -148,11 +148,7 @@ trait InkuireSupport:
     case TypeBounds(low, hi) =>
       inner(low, vars) //TODO for future
     case NoPrefix() =>
-      Inkuire.Type( //TODO check <- should be handled by Singleton case, but doesn't work
-        name = Inkuire.TypeName("_"),
-        itid = Some(Inkuire.ITID("_", isParsed = false)),
-        isStarProjection = true
-      )
+      Inkuire.Type.unresolved //TODO check <- should be handled by Singleton case, but doesn't work
     case MatchType(bond, sc, cases) =>
       inner(sc, vars)
     case ParamRef(TypeLambda(names, _, resType), i) =>