Fix waitOnMessage

xuwei-k · xuwei-k · commit 72238f00f4ed · 2025-10-12T10:22:17.000+09:00
scala/scala3#14308
diff --git a/js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/kit/MsgHandler.scala b/js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/kit/MsgHandler.scala
@@ -43,8 +43,12 @@ private[kit] final class MsgHandler {
     notifyAll()
   }
 
-  @tailrec
   def waitOnMessage(deadline: Deadline): String = synchronized {
+    waitOnMessageLoop(deadline)
+  }
+
+  @tailrec
+  private def waitOnMessageLoop(deadline: Deadline): String = {
     if (msgs.nonEmpty) {
       val (msg, newMsgs) = msgs.dequeue
       msgs = newMsgs
@@ -60,7 +64,7 @@ private[kit] final class MsgHandler {
       }
 
       wait(millis)
-      waitOnMessage(deadline)
+      waitOnMessageLoop(deadline)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,12 @@ private[kit] final class MsgHandler {`
`43`	`43`	`notifyAll()`
`44`	`44`	`}`
`45`	`45`
`46`		`- @tailrec`
`47`	`46`	`def waitOnMessage(deadline: Deadline): String = synchronized {`
	`47`	`+ waitOnMessageLoop(deadline)`
	`48`	`+ }`
	`49`	`+`
	`50`	`+ @tailrec`
	`51`	`+ private def waitOnMessageLoop(deadline: Deadline): String = {`
`48`	`52`	`if (msgs.nonEmpty) {`
`49`	`53`	`val (msg, newMsgs) = msgs.dequeue`
`50`	`54`	`msgs = newMsgs`
`@@ -60,7 +64,7 @@ private[kit] final class MsgHandler {`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`wait(millis)`
`63`		`- waitOnMessage(deadline)`
	`67`	`+ waitOnMessageLoop(deadline)`
`64`	`68`	`}`
`65`	`69`	`}`
`66`	`70`