Skip to content

Commit cb1f64a

Browse files
committed
Fix StepFilterTests on Scala 3.3
1 parent 778bcac commit cb1f64a

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

modules/core/src/main/scala/ch/epfl/scala/debugadapter/ScalaVersion.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ case class ScalaVersion(value: String) {
77
def isScala213: Boolean = value.startsWith("2.13")
88
def isScala30: Boolean = value.startsWith("3.0")
99
def isScala31Plus: Boolean = value.startsWith("3") && !isScala30
10+
def isScala33: Boolean = value.startsWith("3.3")
1011

1112
def binaryVersion: String = if (isScala3) "3" else if (isScala213) "2.13" else "2.12"
1213

modules/tests/src/main/scala/ch/epfl/scala/debugadapter/testfmk/DebugTestSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ trait DebugTest {
3333
def isScala212(implicit ctx: TestingContext) = ctx.scalaVersion.isScala212
3434
def isScala30(implicit ctx: TestingContext) = ctx.scalaVersion.isScala30
3535
def isScala31Plus(implicit ctx: TestingContext) = ctx.scalaVersion.isScala31Plus
36+
def isScala33(implicit ctx: TestingContext) = ctx.scalaVersion.isScala33
3637

3738
def getDebugServer(
3839
debuggee: Debuggee,

modules/tests/src/test/scala/ch/epfl/scala/debugadapter/StepFilterTests.scala

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,28 @@ abstract class StepFilterTests(scalaVersion: ScalaVersion) extends DebugTestSuit
352352
|""".stripMargin
353353

354354
implicit val debuggee: TestingDebuggee = TestingDebuggee.mainClass(source, "example.A", scalaVersion)
355-
if (isScala3) {
355+
if (isScala33) {
356+
check(
357+
Breakpoint(9),
358+
StepIn.line(4),
359+
StepIn.method("String.toString"),
360+
StepIn.line(4),
361+
StepIn.line(9),
362+
StepIn.method("Predef$.println(Object)"),
363+
Breakpoint(10),
364+
StepIn.line(4),
365+
StepOut.line(10),
366+
StepIn.method("Predef$.println(Object)"),
367+
Breakpoint(11),
368+
StepIn.line(18),
369+
StepIn.method("String.toString"),
370+
StepIn.line(18),
371+
StepIn.line(11),
372+
StepIn.method("Predef$.println(Object)"),
373+
Breakpoint(12),
374+
StepIn.method("Predef$.println(Object)")
375+
)
376+
} else if (isScala3) {
356377
check(
357378
// TODO: clean debug line table in Scala 3 compiler
358379
// TODO: introduce $lazyinit$ to isolate user code

0 commit comments

Comments
 (0)