Merge pull request #655 from adpi2/hot-code-replace1

Reinstall all breakpoints in files that changed
scalacenter · Feb 12, 2024 · 47671b2 · 47671b2
2 parents 2d79e66 + 2d1c72c
commit 47671b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/modules/core/src/main/scala/ch/epfl/scala/debugadapter/internal/HotCodeReplaceProvider.scala b/modules/core/src/main/scala/ch/epfl/scala/debugadapter/internal/HotCodeReplaceProvider.scala
@@ -113,7 +113,7 @@ class HotCodeReplaceProvider(
           _ => attemptPopFrames(suspendedThreads, classesToReplace),
           e => Try(warnOrThrow("Cannot pop frames")).map(_ => Seq.empty)
         )
-        _ = publishEvent(HotCodeReplaceEvent.EventType.STARTING, "Start hot code replacement procedure...")
+        _ = publishEvent(HotCodeReplaceEvent.EventType.STARTING, "Starting hot code replacement...")
         _ = redefineClasses(classesToReplace)
         res <-
           if (containsObsoleteMethods(suspendedThreads)) {

diff --git a/modules/java-debug b/modules/java-debug
diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/build.sbt b/modules/sbt-plugin/src/sbt-test/debug-session/hot-code-reload/build.sbt
@@ -17,7 +17,8 @@ def checkBreakpointTask = Def.inputTask {
 
 def checkHotCodeReplaceTask = Def.task {
   val _ = (Compile / compile).value
-  DebugTest.runChecks(DebugState.state)(Seq(RedefineClasses(), Outputed("C")))
+  implicit val context: TestingContext = TestingContext(sourceToDebug.value, scalaV)
+  DebugTest.runChecks(DebugState.state)(Seq(RedefineClasses(), Outputed("C"), Breakpoint(6), Outputed("D")))
 }
 
 def checkNoHotCodeReplaceTask = Def.task {

diff --git a/sbt-launch.jar b/sbt-launch.jar