From 8c22acbf3f33a373b9b65ee07282ed89013cb762 Mon Sep 17 00:00:00 2001 From: Kacper Korban Date: Fri, 20 Sep 2024 10:38:01 +0200 Subject: [PATCH] Bump Inkuire version to fix it for the new Scala versions (#21611) It seems like Inkuire depended on the way some type lambdas were encoded in TASTy which caused it to falsely reject a ton of valid functions. This update also includes a slight change to the ordering heuristic, so that more complicated names of functions are shown lower in the lost and synthetic names are shown last. Inkuire changes: - `1.0.0-M8` https://github.com/VirtusLab/Inkuire/releases/tag/v1.0.0-M8 - `1.0.0-M9` https://github.com/VirtusLab/Inkuire/releases/tag/v1.0.0-M9 [Cherry-picked 806823919d8a4a29877dab5a0c5a9c4cb4df5658] --- project/DocumentationWebsite.scala | 2 +- .../src/dotty/tools/scaladoc/tasty/InkuireSupport.scala | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/DocumentationWebsite.scala b/project/DocumentationWebsite.scala index 5f8e499af62f..5b05168b7f27 100644 --- a/project/DocumentationWebsite.scala +++ b/project/DocumentationWebsite.scala @@ -43,7 +43,7 @@ object DocumentationWebsite { import _root_.scala.concurrent._ import _root_.scala.concurrent.duration.Duration import ExecutionContext.Implicits.global - val inkuireVersion = "v1.0.0-M7" + val inkuireVersion = "v1.0.0-M9" val inkuireLink = s"https://github.com/VirtusLab/Inkuire/releases/download/$inkuireVersion/inkuire.js" val inkuireDestinationFile = baseDest / "dotty_res" / "scripts" / "inkuire.js" sbt.IO.touch(inkuireDestinationFile) diff --git a/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala index 8a703cfb5d24..d5eebd1ab798 100644 --- a/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala +++ b/scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala @@ -184,10 +184,10 @@ trait InkuireSupport(using DocContext) extends Resources: else ownerNameChain(sym.owner) :+ sym.normalizedName private def viableSymbol(s: Symbol): Boolean = - !s.flags.is(Flags.Private) && - !s.flags.is(Flags.Protected) && - !s.flags.is(Flags.Override) && - !s.flags.is(Flags.Synthetic) + !s.flags.is(Flags.Private) && + !s.flags.is(Flags.Protected) && + !s.flags.is(Flags.Override) && + !s.flags.is(Flags.Synthetic) private def varName(t: Inkuire.TypeLike): Option[String] = t match { case tpe: Inkuire.Type => Some(tpe.name.name)