Change more tests to new extended with syntax

Author: odersky

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -3546,15 +3546,13 @@ object Parsers {
           (EmptyValDef, Nil)
       Template(constr, parents, derived, self, stats)
 
-    def templateBody(): (ValDef, List[Tree]) = {
+    def templateBody(): (ValDef, List[Tree]) =
       val r = inDefScopeBraces { templateStatSeq() }
-      if (in.token == WITH) {
+      if in.token == WITH then
         syntaxError(EarlyDefinitionsNotSupported())
         in.nextToken()
         template(emptyConstructor)
-      }
       r
-    }
 
 /* -------- STATSEQS ------------------------------------------- */
 

docs/docs/reference/contextual/relationship-implicits.md

@@ -65,7 +65,7 @@ Anonymous given instances that define extension methods
 get their name from the name of the first extension method and the toplevel type
 constructor of its first parameter. For example, the given instance
 ```scala
-given extension [T] (xs: List[T]) {
+given [T] (xs: List[T]) extended with {
   def second = ...
 }
 ```

tests/neg/extension-methods.scala

@@ -10,7 +10,7 @@ object Test {
   "".l2 // error
   1.l1 // error
 
-  given extension [T](xs: List[T]) {
+  given [T](xs: List[T]) extended with {
     def (x: Int) f1: T = ???  // error: No extension method allowed here, since collective parameters are given
     def f2[T]: T = ???        // error: T is already defined as type T
     def f3(xs: List[T]) = ??? // error: xs is already defined as value xs

tests/neg/i5455.scala

@@ -11,7 +11,7 @@ object Library {
     def toInt(n: Nat): Int = n
 
   }
-  given extension (x: Nat)
+  given (x: Nat) extended with
     def * (y: Nat): Nat = x * y
     def toInt: Int = x
 }

tests/neg/i6900.scala

@@ -1,7 +1,7 @@
 object Test2 {
 
   // Works with extension method
-  given extension [A](a: A) with
+  given [A](a: A) extended with
     def foo[C]: C => A = _ => a   // error: extension method cannot have type parameters
 
   1.foo.foo

tests/pos/i6900.scala

@@ -21,7 +21,7 @@ object Test1 {
 object Test2 {
 
   // Works with extension method
-  given extension [A, C](a: A) with
+  given [A, C](a: A) extended with
     def foo: C => A = _ => a
 
   1.foo.foo

tests/pos/i7084.scala

@@ -2,7 +2,7 @@ object Test {
 
   type Foo
 
-  given extension (y: Any) {
+  given (y: Any) extended with {
     def g(given Foo): Any = ???
   }
 

tests/pos/i7087.scala

@@ -6,7 +6,7 @@ type F[T] = T match {
   case G[a] => String
 }
 
-given extension [T](tup: T) {
+given [T](tup: T) extended with {
   def g(given Foo: F[T]) = ???
 }
 

tests/pos/implicit-scope.scala

@@ -9,7 +9,7 @@ object A {
   type FlagSet = opaques.FlagSet
   def FlagSet(bits: Long): FlagSet = opaques.FlagSet(bits)
 
-  given extension (xs: FlagSet) {
+  given (xs: FlagSet) extended with {
     def bits: Long = opaques.toBits(xs)
     def | (ys: FlagSet): FlagSet = FlagSet(xs.bits | ys.bits)
   }

tests/pos/matrixOps.scala

@@ -3,7 +3,7 @@ object Test with
   type Matrix = Array[Array[Double]]
   type Vector = Array[Double]
 
-  given extension (m: Matrix)
+  given (m: Matrix) extended with
     def nRows = m.length
     def nCols = m(0).length
     def row(i: Int): Vector = m(i)