Skip to content

Upgrade to Scala 3.8.3. #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjrd merged 2 commits into from
Apr 4, 2026
Merged

Upgrade to Scala 3.8.3. #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af7b40a
Fix #464: Deal with so-called CompactAnnotation's.
sjrd Apr 4, 2026
700ce0b
Upgrade to Scala 3.8.3.
sjrd Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import sbt.internal.util.ManagedLogger

import org.scalajs.jsenv.nodejs.NodeJSEnv

val usedScalaCompiler = "3.8.1"
val usedScalaCompiler = "3.8.3"
val usedTastyRelease = usedScalaCompiler
val scala2Version = "2.13.18"

Expand Down
12 changes: 10 additions & 2 deletions tasty-query/shared/src/main/scala/tastyquery/reader/tasties/TreeUnpickler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,10 +397,18 @@ private[tasties] class TreeUnpickler private (
private def readAnnotation()(using SourceFile): Annotation =
val end = reader.readEnd()
skipTree() // skip the typeref to the annotation class; we only use the tree
val tree = readTerm
Annotation(tree)

if isCompactAnnotTypeTag(reader.nextByte) then
// #464 Apparently we can have CompactAnnotations anyway?
Annotation.fromAnnotTypeAndArgs(readTrueType(), Nil)
else Annotation(readTerm)
end readAnnotation

/** Can `tag` start a type argument of a CompactAnnotation? */
private def isCompactAnnotTypeTag(tag: Int): Boolean = tag match
case APPLIEDtype | SHAREDtype | TYPEREF | TYPEREFdirect | TYPEREFsymbol | TYPEREFin => true
case _ => false

/** Performs the read action as if SHARED tags were transparent:
* - follows the SHARED tags to the term or type that is shared
* - reads the shared term or type with {@code read} action
Expand Down
Loading