More fixes

Author: odersky

compiler/test-resources/repl/erased-implicit

@@ -1,2 +1,2 @@
 scala> def f(given erased a: Int): Int = ???
-def f(given erased a: Int): Int
+def f given erased (a: Int): Int

language-server/test/dotty/tools/languageserver/util/CodeTester.scala

@@ -237,7 +237,7 @@ class CodeTester(projects: List[Project]) {
 
   private def doAction(action: Action): this.type = {
     try {
-      action.execute() given (testServer, testServer.client, positions)
+      action.execute()(given testServer, testServer.client, positions)
     } catch {
       case ex: AssertionError =>
         val sourcesStr =
@@ -252,7 +252,7 @@ class CodeTester(projects: List[Project]) {
             |
             |$sourcesStr
             |
-            |while executing action: ${action.show given positions}
+            |while executing action: ${action.show(given positions)}
             |
           """.stripMargin
         val assertionError = new AssertionError(msg + ex.getMessage)

tests/neg/i4044a.scala

@@ -8,7 +8,7 @@ def test(given QuoteContext) = {
     a // error
     $a
     '{$a} // error
-    '{(given QuoteContext) = ???; '{$a} } // error
+    '{ given QuoteContext =???; '{$a} } // error
   }
 
 }

tests/neg/i4044b.scala

@@ -13,7 +13,7 @@ def test(given QuoteContext) = {
       b // error
       ${b}
       ${ '{b} } // error
-      '{(given QuoteContext) = ???; '{$b} } // error
+      '{ given QuoteContext =???; '{$b} } // error
     }
 
   }

tests/patmat/i6255b.scala

@@ -1,5 +1,5 @@
 class Foo {
-  def foo(x: quoted.Expr[Int]) given scala.quoted.QuoteContext: Unit = x match {
+  def foo(x: quoted.Expr[Int])(given scala.quoted.QuoteContext): Unit = x match {
     case '{ 1 } =>
     case '{ 2 } =>
   }

tests/run-staging/i5152.scala

@@ -5,7 +5,7 @@ object Test {
   given Toolbox = Toolbox.make(getClass.getClassLoader)
   def eval1(ff: Expr[Int => Int])(given QuoteContext): Expr[Int => Int] = '{identity}
 
-  def peval1()given QuoteContext: Expr[Unit] = '{
+  def peval1()(given QuoteContext): Expr[Unit] = '{
     lazy val f: Int => Int = ${eval1('{(y: Int) => f(y)})}
   }
 

tests/run-staging/shonan-hmm-simple.scala

@@ -35,13 +35,13 @@ class RingComplex[U](u: Ring[U]) extends Ring[Complex[U]] {
 }
 
 sealed trait PV[T] {
-  def expr given Liftable[T], QuoteContext: Expr[T]
+  def expr(given Liftable[T], QuoteContext): Expr[T]
 }
 case class Sta[T](x: T) extends PV[T] {
-  def expr given Liftable[T], QuoteContext: Expr[T] = x
+  def expr(given Liftable[T], QuoteContext): Expr[T] = x
 }
 case class Dyn[T](x: Expr[T]) extends PV[T] {
-  def expr given Liftable[T], QuoteContext: Expr[T] = x
+  def expr(given Liftable[T], QuoteContext): Expr[T] = x
 }
 
 class RingPV[U: Liftable](u: Ring[U], eu: Ring[Expr[U]])(given QuoteContext) extends Ring[PV[U]] {

tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala

@@ -14,7 +14,7 @@ class TastyInterpreter extends TastyConsumer {
         case DefDef("main", _, _, _, Some(rhs)) =>
           val interpreter = new jvm.Interpreter(reflect)
 
-          interpreter.eval(rhs) given Map.empty
+          interpreter.eval(rhs)(given Map.empty)
         // TODO: recurse only for PackageDef, ClassDef
         case tree =>
           super.traverseTree(tree)

tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala

@@ -65,7 +65,7 @@ abstract class TreeInterpreter[R <: Reflection & Singleton](val reflect: R) {
   def interpretBlock(stats: List[Statement], expr: Term): Result = {
     val newEnv = stats.foldLeft(implicitly[Env])((accEnv, stat) => stat match {
       case ValDef(name, tpt, Some(rhs)) =>
-        def evalRhs = eval(rhs) given accEnv
+        def evalRhs = eval(rhs)(given accEnv)
         val evalRef: LocalValue =
           if (stat.symbol.flags.is(Flags.Lazy)) LocalValue.lazyValFrom(evalRhs)
           else if (stat.symbol.flags.is(Flags.Mutable)) LocalValue.varFrom(evalRhs)
@@ -76,10 +76,10 @@ abstract class TreeInterpreter[R <: Reflection & Singleton](val reflect: R) {
         // TODO: record the environment for closure purposes
         accEnv
       case stat =>
-        eval(stat) given accEnv
+        eval(stat)(given accEnv)
         accEnv
     })
-    eval(expr) given newEnv
+    eval(expr)(given newEnv)
   }
 
   def interpretUnit(): AbstractAny