Skip to content

Commit

Permalink
Bump Inkuire version to fix it for the new Scala versions (#21611)
Browse files Browse the repository at this point in the history
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 8068239]
  • Loading branch information
KacperFKorban authored and WojciechMazur committed Dec 3, 2024
1 parent 9391d6c commit cc4f5c1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion project/DocumentationWebsite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions scaladoc/src/dotty/tools/scaladoc/tasty/InkuireSupport.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit cc4f5c1

Please sign in to comment.