Fix bootstrapped tests

Author: odersky

language-server/test/dotty/tools/languageserver/util/actions/CodeRename.scala

@@ -33,10 +33,11 @@ class CodeRename(override val marker: CodeMarker,
     withOverridden.foreach { includeOverridden =>
       var question: (ShowMessageRequestParams, CompletableFuture[MessageActionItem]) = null
       val startTime = System.currentTimeMillis()
-      do {
+      while {
         Thread.sleep(50)
         question = client.requests.get.headOption.orNull
-      } while (question == null && System.currentTimeMillis() - startTime < TIMEOUT_MS)
+        question == null && System.currentTimeMillis() - startTime < TIMEOUT_MS
+      } do ()
 
       if (question == null) fail("The server didn't ask about overridden symbols.")
 

tests/run-macros/quote-inline-function.check

@@ -7,11 +7,12 @@ Normal function
     f.apply(x$1)
     i = i.+(1)
   }
-  do {
+  while ({
     val x$2: scala.Int = i
     f.apply(x$2)
     i = i.+(1)
-  } while (i.<(j))
+    i.<(j)
+  }) ()
 }
 
 By name function
@@ -23,9 +24,10 @@ By name function
     scala.Predef.println(x$3)
     i = i.+(1)
   }
-  do {
+  while ({
     val x$4: scala.Int = i
     scala.Predef.println(x$4)
     i = i.+(1)
-  } while (i.<(j))
+    i.<(j)
+  }) ()
 }

tests/run-macros/quote-inline-function/quoted_1.scala

@@ -15,10 +15,11 @@ object Macros {
         ${f.apply('i)}
         i += 1
       }
-      do {
+      while {
         ${f.apply('i)}
         i += 1
-      } while (i < j)
+        i < j
+      } do ()
     }
     res.show
   }

tests/run-macros/tasty-tree-map/quoted_2.scala

@@ -16,7 +16,7 @@ object Test {
     println(identityMaped({ val i = 34; i }))
     println(identityMaped({ var i = 34; i += 1; i }))
     println(identityMaped({ var i = 0; while (i < 36) i += 1; i }))
-    println(identityMaped({ var i = 0; do i += 1 while (i < 37); i }))
+    println(identityMaped({ var i = 0; while { i += 1 ; i < 37 } do (); i }))
     println(identityMaped(try 38 finally ()))
     println(identityMaped(try 39 catch { case _: Error => }))
     println(identityMaped(new java.lang.Integer(40)))

tests/run-with-compiler/quote-lib.scala

@@ -137,7 +137,7 @@ package liftable {
 
   object Loops {
     def liftedWhile(cond: Expr[Boolean])(body: Expr[Unit]) given QuoteContext: Expr[Unit] = '{ while ($cond) $body }
-    def liftedDoWhile(body: Expr[Unit])(cond: Expr[Boolean]) given QuoteContext: Expr[Unit] = '{ do $body while ($cond) }
+    def liftedDoWhile(body: Expr[Unit])(cond: Expr[Boolean]) given QuoteContext: Expr[Unit] = '{ while { $body ; $cond } do () }
   }