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

adpi2 · web-flow · commit 47671b2d4819 · 2024-02-12T17:16:11.000+01:00
Reinstall all breakpoints in files that changed
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
@@ -1 +1 @@
-Subproject commit d5608e5d38a122f5741fec67e1a0d49ebf9b26ff
+Subproject commit 39b44d171fa22ec4cd497f73db1c769f19f3e44d
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

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ class HotCodeReplaceProvider(`
`113`	`113`	`_ => attemptPopFrames(suspendedThreads, classesToReplace),`
`114`	`114`	`e => Try(warnOrThrow("Cannot pop frames")).map(_ => Seq.empty)`
`115`	`115`	`)`
`116`		`- _ = publishEvent(HotCodeReplaceEvent.EventType.STARTING, "Start hot code replacement procedure...")`
	`116`	`+ _ = publishEvent(HotCodeReplaceEvent.EventType.STARTING, "Starting hot code replacement...")`
`117`	`117`	`_ = redefineClasses(classesToReplace)`
`118`	`118`	`res <-`
`119`	`119`	`if (containsObsoleteMethods(suspendedThreads)) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ def checkBreakpointTask = Def.inputTask {`
`17`	`17`
`18`	`18`	`def checkHotCodeReplaceTask = Def.task {`
`19`	`19`	`val _ = (Compile / compile).value`
`20`		`- DebugTest.runChecks(DebugState.state)(Seq(RedefineClasses(), Outputed("C")))`
	`20`	`+ implicit val context: TestingContext = TestingContext(sourceToDebug.value, scalaV)`
	`21`	`+ DebugTest.runChecks(DebugState.state)(Seq(RedefineClasses(), Outputed("C"), Breakpoint(6), Outputed("D")))`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`def checkNoHotCodeReplaceTask = Def.task {`