Fix inkuire links 2

Author: KacperFKorban

project/Build.scala

@@ -1267,7 +1267,7 @@ object Build {
         scalaSrcLink(stdLibVersion, srcManaged(dottyNonBootstrappedVersion, "scala")),
         dottySrcLink(referenceVersion, srcManaged(dottyNonBootstrappedVersion, "dotty")),
         s"-source-links:github://lampepfl/dotty/$referenceVersion",
-      ) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets
+      ) ++ scalacOptionsDocSettings ++ revision ++ params ++ targets ++ Seq("-generate-inkuire")
       import _root_.scala.sys.process._
       val escapedCmd = cmd.map(arg => if(arg.contains(" ")) s""""$arg"""" else arg)
       Def.task {

scaladoc-js/src/searchbar/SearchbarComponent.scala

@@ -39,7 +39,7 @@ class SearchbarComponent(engine: SearchbarEngine, inkuireEngine: InkuireJSSearch
       wrapper.classList.add("monospace")
 
       val resultA = document.createElement("a").asInstanceOf[html.Anchor]
-      resultA.href = Globals.pathToRoot + p.location.drop(21) //TODO change when generating XD
+      resultA.href = p.location
       resultA.text = s"${p.fullName}"
 
       val location = document.createElement("span")

scaladoc/resources/dotty_res/scripts/inkuire-config.json

@@ -1,9 +1,5 @@
 {
-  "address": {"address": "0.0.0.0"},
-  "port": { "port": 8080 },
   "inkuirePaths": [
-    {"path" : "db.json"}
-  ],
-  "dbPaths": [],
-  "ancestryGraphPaths": []
+    {"path" : "../inkuire-db.json"}
+  ]
 }

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

@@ -4,7 +4,7 @@ import dotty.tools.scaladoc.util._
 
 object Inkuire {
 
-  var db = InkuireDb(Seq.empty, Map.empty) //TODO forgive me :(
+  var db = InkuireDb(Seq.empty, Map.empty)
 
   case class InkuireDb(
     functions: Seq[ExternalSignature],
@@ -28,10 +28,10 @@ object Inkuire {
   }
 
   case class ExternalSignature(
-    signature:   Signature,
-    name:        String,
-    packageName: String,
-    uri:         String
+    signature:    Signature,
+    name:         String,
+    packageName:  String,
+    uri:      String
   )
 
   case class Type(

scaladoc/src/dotty/tools/scaladoc/Scaladoc.scala

@@ -7,7 +7,7 @@ import java.util.jar._
 import collection.JavaConverters._
 import collection.immutable.ArraySeq
 
-import java.nio.file.Files
+import java.nio.file.{ Files, Paths }
 
 import dotty.tools.dotc.config.Settings._
 import dotty.tools.dotc.config.{ CommonScalaSettings, AllScalaSettings }
@@ -82,19 +82,22 @@ object Scaladoc:
         report.inform("Done")
       else report.error("Failure")
 
-      if parsedArgs.generateInkuire then dumpInkuireDB()
+      if parsedArgs.generateInkuire then dumpInkuireDB(parsedArgs.output.getAbsolutePath)
     }
 
     ctx.reporter
 
-  def dumpInkuireDB() = {
+  def dumpInkuireDB(output: String) = {
+    val path = Paths.get(output, "inkuire-db.json")
+    println("InkuireDB created successfully!")
     println(s"Types: ${Inkuire.db.types.size}")
     println(s"Functions: ${Inkuire.db.functions.size}")
-    val file = new File("./inkuire-db.json")
+    val file = path.toFile()
     file.createNewFile()
-    val myWriter = new FileWriter("./inkuire-db.json", false)
+    val myWriter = new FileWriter(file, false)
     myWriter.write(s"${EngineModelSerializers.serialize(Inkuire.db)}")
     myWriter.close()
+    println(s"Saved InkuireDB in file: ${path.toString}")
   }
 
   def extract(args: Array[String], rootCtx: CompilerContext): (Option[Scaladoc.Args], CompilerContext) =

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

@@ -90,7 +90,6 @@ trait InkuireSupport:
     case AnnotatedType(tpe, _) =>
       inner(tpe, vars)
     case tl @ TypeLambda(params, paramBounds, resType) =>
-      if resType.typeSymbol.name == "Seq" then println(resType)
       inner(resType, vars) //TODO for future
     case r: Refinement =>
       inner(r.info, vars) //TODO for future