Handle unresolved variance

Author: KacperFKorban

scaladoc-js/src/searchbar/SearchbarComponent.scala

@@ -69,6 +69,23 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireDelegate
     }
     loadMoreResults(result.drop(resultsChunkSize))
 
+  extension (s: String)
+    def toHTMLError =
+      val wrapper = document.createElement("div").asInstanceOf[html.Div]
+      wrapper.classList.add("scaladoc-searchbar-result")
+      wrapper.classList.add("monospace")
+
+      val resultA = document.createElement("a").asInstanceOf[html.Anchor]
+      resultA.text = s
+
+      val location = document.createElement("span")
+      location.classList.add("pull-right")
+      location.classList.add("scaladoc-searchbar-location")
+
+      wrapper.appendChild(resultA)
+      wrapper.appendChild(location)
+      wrapper
+
   var timeoutHandle: SetTimeoutHandle = null
   def handleNewQuery(query: String) =
     clearTimeout(timeoutHandle)
@@ -80,9 +97,10 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireDelegate
         handleNewFluffQuery(matchers)
       case BySignature(signature) =>
         timeoutHandle = setTimeout(1.second) {
-          println("Searching")
           inkuireEngine.query(query) { (p: PageEntry) =>
             resultsDiv.appendChild(p.toHTMLInkuireHack)
+          } { (s: String) =>
+            resultsDiv.appendChild(s.toHTMLError)
           }
         }
     }

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

@@ -34,7 +34,7 @@ class InkuireDelegateSearchEngine {
   val ec2 = "https://pmfyy2t0sc.execute-api.eu-central-1.amazonaws.com/prod" //TODO configure
 
   private def getURLContent(url: String): Future[String] = Ajax.get(url).map(_.responseText).fallbackTo(Future("[]"))
-  
+
   def dynamicToPageEntry(d: Dynamic): PageEntry =
     PageEntry(
       d.functionName.asInstanceOf[String],
@@ -44,10 +44,11 @@ class InkuireDelegateSearchEngine {
       List.empty
     )
 
-  def query(s: String)(callback: PageEntry => Node): Unit = {
+  def query(s: String)(callback: PageEntry => Node)(errorCallback: String => Node): Unit = { //TODO handle errors
     val signature = URIUtils.encodeURIComponent(s)
-    getURLContent(ec2 + "/forSignature?signature=" + signature).map(JSON.parse(_)).foreach { (d: Dynamic) =>
-      d.matches.asInstanceOf[js.Array[Dynamic]].map(dynamicToPageEntry).foreach(callback)
+    val request = getURLContent(ec2 + "/forSignature?signature=" + signature)
+    request.foreach { (s: String) =>
+      JSON.parse(s).matches.asInstanceOf[js.Array[Dynamic]].map(dynamicToPageEntry).foreach(callback)
     }
   }
 

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

@@ -159,7 +159,11 @@ object Inkuire {
           ("typ", serialize(v.typ)),
           ("variancekind", serialize("contravariance"))
         )
-      case _: UnresolvedVariance => serialize("KAWABANGA")
+      case _: UnresolvedVariance =>
+        jsonObject(
+          ("typ", serialize(v.typ)),
+          ("variancekind", serialize("unresolved"))
+        )
     }
 
     private def serialize(e: ExternalSignature): JSON = {

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

@@ -44,7 +44,7 @@ trait InkuireSupport:
   given SymbolSyntaxInkuire: AnyRef with
     extension (symbol: Symbol)
       def itid(using dctx: DocContext): Option[Inkuire.ITID] = Some(Inkuire.ITID(symbol.dri.symbolUUID, isParsed = false))
-  
+
   given TypeSyntaxInkuire: AnyRef with
     extension (tpe: TypeRepr)
       def asInkuire(vars: Set[String]): Inkuire.Type = inner(tpe, vars)