Accommodate Scala 2 annotation value

som-snytt · som-snytt · commit d93e6313c1ab · 2025-11-06T17:31:14.000-08:00
diff --git a/compiler/src/dotty/tools/dotc/core/Annotations.scala b/compiler/src/dotty/tools/dotc/core/Annotations.scala
@@ -38,7 +38,7 @@ object Annotations {
       if (i < args.length) Some(args(i)) else None
     }
     def argumentConstant(i: Int)(using Context): Option[Constant] =
-      for (case ConstantType(c) <- argument(i) map (_.tpe.widenTermRefExpr.normalized)) yield c
+      for case ConstantType(c) <- argument(i).map(arg => stripCast(arg).tpe.widenTermRefExpr.normalized) yield c
 
     def argumentConstantString(i: Int)(using Context): Option[String] =
       for (case Constant(s: String) <- argumentConstant(i)) yield s

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ object Annotations {`
`38`	`38`	`if (i < args.length) Some(args(i)) else None`
`39`	`39`	`}`
`40`	`40`	`def argumentConstant(i: Int)(using Context): Option[Constant] =`
`41`		`- for (case ConstantType(c) <- argument(i) map (_.tpe.widenTermRefExpr.normalized)) yield c`
	`41`	`+ for case ConstantType(c) <- argument(i).map(arg => stripCast(arg).tpe.widenTermRefExpr.normalized) yield c`
`42`	`42`
`43`	`43`	`def argumentConstantString(i: Int)(using Context): Option[String] =`
`44`	`44`	`for (case Constant(s: String) <- argumentConstant(i)) yield s`