Merge pull request #13023 from KacperFKorban/fix-scaladoc-cmd-test

Fix scaladoc cmd test

Author: romanowski

project/scripts/cmdTests

@@ -76,6 +76,7 @@ dist/target/pack/bin/scaladoc \
   "-skip-by-regex:.+\.impl($|\..+)" \
   -project-logo docs/logo.svg \
   -social-links:github::https://github.com/lampepfl/dotty,gitter::https://gitter.im/scala/scala,twitter::https://twitter.com/scala_lang \
+  -Ygenerate-inkuire \
   "-skip-by-id:scala.runtime.stdLibPatches" \
   "-skip-by-id:scala.runtime.MatchCase" \
   -project-footer "Copyright (c) 2002-2021, LAMP/EPFL" \

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

@@ -7,6 +7,14 @@ object Inkuire {
 
   var db = InkuireDb(Seq.empty, Map.empty, Seq.empty)
 
+  def beforeSave(): Unit = {
+    db = db.copy(
+      functions = db.functions.sortBy(_.hashCode),
+      types = db.types.toSeq.sortBy(_._1.uuid).toMap,
+      implicitConversions = db.implicitConversions.sortBy(_._1.uuid)
+    )
+  }
+
   def generateInkuireConfig(externalMappings: Seq[String]): String = {
     val paths = ("../inkuire-db.json" +: externalMappings.map(_ + "../inkuire-db.json")).map(jsonString)
     jsonObject(("inkuirePaths", jsonList(paths))).toString

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

@@ -93,6 +93,7 @@ object Scaladoc:
     val dbFile = dbPath.toFile()
     dbFile.createNewFile()
     val dbWriter = new FileWriter(dbFile, false)
+    Inkuire.beforeSave()
     dbWriter.write(s"${EngineModelSerializers.serialize(Inkuire.db)}")
     dbWriter.close()