move to classes to skip

scalacenter · Sep 20, 2023 · 8974974 · 8974974
1 parent fc6847a
commit 8974974
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...ore/src/main/scala/ch/epfl/scala/debugadapter/internal/stacktrace/RuntimeStepFilter.scala b/...ore/src/main/scala/ch/epfl/scala/debugadapter/internal/stacktrace/RuntimeStepFilter.scala
@@ -5,13 +5,10 @@ import com.sun.jdi.Location
 import ch.epfl.scala.debugadapter.ScalaVersion
 
 private[internal] class RuntimeStepFilter(classesToSkip: Set[String], methodsToSkip: Set[String]) extends StepFilter {
-  override def shouldSkipOver(method: Method): Boolean = shouldSkipOut(method) || isBoxingMethod(method)
+  override def shouldSkipOver(method: Method): Boolean = shouldSkipOut(method)
   override def shouldSkipOut(upperLocation: Location, method: Method): Boolean = shouldSkipOut(method)
   private def shouldSkipOut(method: Method): Boolean =
     classesToSkip.contains(method.declaringType.name) || methodsToSkip.contains(method.toString)
-  private def isBoxingMethod(method: Method): Boolean = {
-    method.declaringType().name().startsWith("scala.runtime.BoxesRunTime")
-  }
 }
 
 private[internal] object RuntimeStepFilter {
@@ -30,7 +27,8 @@ private[internal] object RuntimeStepFilter {
     "scala.runtime.LazyLong",
     "scala.runtime.LazyFloat",
     "scala.runtime.LazyDouble",
-    "scala.runtime.LazyUnit"
+    "scala.runtime.LazyUnit",
+    "scala.runtime.BoxesRunTime"
   )
   private val scala3ClassesToSkip = scalaClassesToSkip ++ Set("scala.runtime.LazyVals$")
   private val scala2ClassesToSkip = scalaClassesToSkip

diff --git a/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/StepFilterTests.scala b/modules/tests/src/test/scala/ch/epfl/scala/debugadapter/StepFilterTests.scala
@@ -34,7 +34,7 @@ class Scala3StepFilterTests extends StepFilterTests(ScalaVersion.`3.1+`) {
          |  }
          |}""".stripMargin
     implicit val debuggee: TestingDebuggee = TestingDebuggee.mainClass(source, "example.Main", scalaVersion)
-    check(Breakpoint(6), StepIn.method("Integer.valueOf(int): Integer"))
+    check(Breakpoint(6), StepIn.line(5))
   }
 
   test("skip exported methods") {