Skip to content

Commit 2f05fc0

Browse files
committed
Fix Scala 3.3 decoder tests
1 parent 961bbc9 commit 2f05fc0

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

modules/decoder/src/test/scala/ch/epfl/scala/debugadapter/internal/stacktrace/BinaryDecoderTests.scala

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -933,15 +933,13 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
933933
val decoder = TestingDecoder(source, scalaVersion)
934934
decoder.assertDecode(
935935
"example.A",
936-
if isScala33 then "java.lang.String y$1(java.lang.String x$2, scala.runtime.LazyRef y$lzy1$2)"
937-
else "java.lang.String y$1(scala.runtime.LazyRef y$lzy1$2, java.lang.String x$2)",
936+
"java.lang.String y$1(scala.runtime.LazyRef y$lzy1$2, java.lang.String x$2)",
938937
"A.m.y: String",
939938
skip = true
940939
)
941940
decoder.assertDecode(
942941
"example.A",
943-
if isScala33 then "java.lang.String y$lzyINIT1$1(java.lang.String x$1, scala.runtime.LazyRef y$lzy1$1)"
944-
else "java.lang.String y$lzyINIT1$1(scala.runtime.LazyRef y$lzy1$1, java.lang.String x$1)",
942+
"java.lang.String y$lzyINIT1$1(scala.runtime.LazyRef y$lzy1$1, java.lang.String x$1)",
945943
"A.m.y.<lazy init>: String"
946944
)
947945
}
@@ -1140,23 +1138,19 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
11401138
val decoder = TestingDecoder(source, scalaVersion)
11411139
decoder.assertDecode(
11421140
"example.A",
1143-
if isScala33 then "java.lang.String m(int x, java.lang.String evidence$1)"
1144-
else "java.lang.String m(int x, java.lang.String contextual$1)",
1141+
"java.lang.String m(int x, java.lang.String contextual$1)",
11451142
"A.m(x: Int): String ?=> String"
11461143
)
11471144
decoder.assertDecode(
11481145
"example.A",
1149-
if isScala33 then "int m(int evidence$2, java.lang.String evidence$3)"
1150-
else "int m(int contextual$2, java.lang.String contextual$3)",
1146+
"int m(int contextual$2, java.lang.String contextual$3)",
11511147
"A.m(): (Int, String) ?=> Int"
11521148
)
11531149
decoder.assertDecode(
11541150
"example.A",
1155-
if isScala33 then "java.lang.String m(java.lang.String x, int evidence$4, java.lang.String evidence$5)"
1156-
else "java.lang.String m(java.lang.String x, int contextual$4, java.lang.String contextual$5)",
1151+
"java.lang.String m(java.lang.String x, int contextual$4, java.lang.String contextual$5)",
11571152
"A.m(x: String): Int ?=> String ?=> String"
11581153
)
1159-
// TODO try in 3.3.2 or 3.3.3
11601154
if isScala34 then
11611155
val source =
11621156
"""|package example
@@ -1685,9 +1679,7 @@ abstract class BinaryDecoderTests(scalaVersion: ScalaVersion) extends BinaryDeco
16851679
)
16861680
decoder.assertDecode(
16871681
"example.Test",
1688-
if isScala33 then
1689-
"java.lang.String $anonfun$2(scala.Function1 f$proxy1$1, example.Logger Logger_this$1, java.lang.String x)"
1690-
else "java.lang.String $anonfun$2(example.Logger Logger_this$1, scala.Function1 f$proxy1$1, java.lang.String x)",
1682+
"java.lang.String $anonfun$2(example.Logger Logger_this$1, scala.Function1 f$proxy1$1, java.lang.String x)",
16911683
"Logger.m2.<anon fun>(x: String): String"
16921684
)
16931685
decoder.assertDecode(

0 commit comments

Comments
 (0)