Change colon to with in tests

Author: odersky

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -7,7 +7,7 @@ import org.junit.{Ignore, Test}
 import org.junit.Assert.{assertEquals, fail}
 import org.junit.experimental.categories.Category
 
-abstract class CommunityBuildTest:
+abstract class CommunityBuildTest with
   given CommunityBuildTest = this
 
   /** Depending on the mode of operation, either
@@ -81,7 +81,7 @@ abstract class CommunityBuildTest:
 end CommunityBuildTest
 
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTestA extends CommunityBuildTest:
+class CommunityBuildTestA extends CommunityBuildTest with
   @Test def endpoints4s = projects.endpoints4s.run()
   @Test def fansi = projects.fansi.run()
   @Test def fastparse = projects.fastparse.run()
@@ -119,7 +119,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
 end CommunityBuildTestA
 
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTestB extends CommunityBuildTest:
+class CommunityBuildTestB extends CommunityBuildTest with
   @Test def algebra = projects.algebra.run()
   @Test def betterfiles = projects.betterfiles.run()
   @Test def cats = projects.cats.run()

compiler/test/dotty/tools/AnnotationsTests.scala

@@ -14,7 +14,7 @@ import dotc.core.Symbols._
 import java.io.File
 import java.nio.file._
 
-class AnnotationsTest:
+class AnnotationsTest with
 
   @Test def annotTreeNotErased: Unit =
     withJavaCompiled(

compiler/test/dotty/tools/SignatureTest.scala

@@ -14,7 +14,7 @@ import dotc.core.Symbols._
 import java.io.File
 import java.nio.file._
 
-class SignatureTest:
+class SignatureTest with
   @Test def signatureCaching: Unit =
     inCompilerContext(TestConfiguration.basicClasspath, separateRun = true, "case class Foo(value: Unit)") {
       val (ref, refSig) = atPhase(erasurePhase.next) {

compiler/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala

@@ -411,7 +411,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
   }
 
   @Test def i6375 = {
-    val source = """class Test:
+    val source = """class Test with
                    |  given Int = 0
                    |  def f(): Int ?=> Boolean = true : (Int ?=> Boolean)
                    |  transparent inline def g(): Int ?=> Boolean = true
@@ -440,7 +440,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
   }
 
   @Test def i6800a = {
-    val source = """class Foo:
+    val source = """class Foo with
                    |  inline def inlined(f: => Unit): Unit = f
                    |  def test: Unit = inlined { println("") }
                  """.stripMargin
@@ -459,7 +459,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
   }
 
   @Test def i6800b = {
-    val source = """class Foo:
+    val source = """class Foo with
                    |  inline def printIfZero(x: Int): Unit = inline x match
                    |    case 0 => println("zero")
                    |    case _ => ()
@@ -485,7 +485,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
 
 
   @Test def i9246 = {
-    val source = """class Foo:
+    val source = """class Foo with
                    |  inline def check(v:Double): Unit = if(v==0) throw new Exception()
                    |  inline def divide(v: Double, d: Double): Double = { check(d); v / d }
                    |  def test =  divide(10,2)
@@ -504,7 +504,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
   }
 
   @Test def finalVals = {
-    val source = """class Test:
+    val source = """class Test with
                    |  final val a = 1 // should be inlined but not erased
                    |  inline val b = 2 // should be inlined and erased
                    |  def test: Int = a + b
@@ -527,7 +527,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
 
 
   @Test def i9466 = {
-    val source = """class Test:
+    val source = """class Test with
                    |  inline def i(inline f: Int => Boolean): String =
                    |   if f(34) then "a"
                    |   else "b"
@@ -553,7 +553,7 @@ class InlineBytecodeTests extends DottyBytecodeTest {
   }
 
   @Test def beta_reduce_under_block = {
-    val source = """class Test:
+    val source = """class Test with
                    |  def test =
                    |    {
                    |      val a = 3

compiler/test/dotty/tools/dotc/SettingsTests.scala

@@ -41,7 +41,7 @@ class SettingsTests {
     assertEquals(1, reporter.errorCount)
 
   @Test def acceptUnconstrained: Unit =
-    object Settings extends SettingGroup:
+    object Settings extends SettingGroup with
       val foo = StringSetting("-foo", "foo", "Foo", "a")
       val bar = IntSetting("-bar", "Bar", 0)
 
@@ -54,7 +54,7 @@ class SettingsTests {
     }
 
   @Test def validateChoices: Unit =
-    object Settings extends SettingGroup:
+    object Settings extends SettingGroup with
       val foo = ChoiceSetting("-foo", "foo", "Foo", List("a", "b"), "a")
       val bar = IntChoiceSetting("-bar", "Bar", List(0, 1, 2), 0)
       val baz = IntChoiceSetting("-baz", "Baz", 0 to 10, 10)

compiler/test/dotty/tools/dotc/config/CommandLineParserTest.scala

@@ -4,7 +4,7 @@ package dotty.tools.dotc.config
 import org.junit.Assert.{assertEquals, assertTrue}
 import org.junit.Test
 
-class CommandLineParserTest:
+class CommandLineParserTest with
   import CommandLineParser.{tokenize, ParseException}
 
   private def check(tokens: String*)(input: String): Unit = assertEquals(tokens, tokenize(input))

compiler/test/dotty/tools/dotc/config/ScalaSettingsTests.scala

@@ -7,10 +7,10 @@ import Settings._
 import org.junit.Test
 import org.junit.Assert._
 
-class ScalaSettingsTests:
+class ScalaSettingsTests with
 
   @Test def `A setting with aliases is accepted`: Unit =
-    class MySettings extends SettingGroup:
+    class MySettings extends SettingGroup with
       val classpath: Setting[String] = PathSetting("-classpath", "Specify where to find user class files.", ".", aliases = List("--class-path", "-cp"))
     val settings = MySettings()
     val args = tokenize("-cp path/to/classes1:other/path/to/classes2")
@@ -23,7 +23,7 @@ class ScalaSettingsTests:
     assertTrue("wrong classpath", classpath == "path/to/classes1:other/path/to/classes2")
 
   @Test def `A multistring setting is multivalued`: Unit =
-    class SUT extends SettingGroup:
+    class SUT extends SettingGroup with
       val language: Setting[List[String]] = MultiStringSetting("-language", "feature", "Enable one or more language features.")
     val sut  = SUT()
     val args = tokenize("-language:implicitConversions,dynamics")
@@ -37,7 +37,7 @@ class ScalaSettingsTests:
     assertTrue("Has the feature", set.contains("dynamics"))
 
   @Test def `t9719 Apply -language more than once`: Unit =
-    class SUT extends SettingGroup:
+    class SUT extends SettingGroup with
       val language: Setting[List[String]] = MultiStringSetting("-language", "feature", "Enable one or more language features.")
     val sut  = SUT()
     val args = tokenize("-language:implicitConversions -language:dynamics")
@@ -51,7 +51,7 @@ class ScalaSettingsTests:
     assertTrue("Has the feature", set.contains("dynamics"))
 
   @Test def `Warn if multistring element is supplied multiply`: Unit =
-    class SUT extends SettingGroup:
+    class SUT extends SettingGroup with
       val language: Setting[List[String]] = MultiStringSetting("-language", "feature", "Enable one or more language features.")
     val sut  = SUT()
     val args = tokenize("-language:dynamics -language:implicitConversions -language:dynamics")

compiler/test/dotty/tools/dotc/semanticdb/SemanticdbTests.scala

@@ -26,7 +26,7 @@ import dotty.tools.dotc.util.SourceFile
   SemanticdbTests().runExpectTest(updateExpectFiles = true)
 
 @Category(Array(classOf[BootstrappedOnlyTests]))
-class SemanticdbTests:
+class SemanticdbTests with
   val javaFile = FileSystems.getDefault.getPathMatcher("glob:**.java")
   val scalaFile = FileSystems.getDefault.getPathMatcher("glob:**.scala")
   val expectFile = FileSystems.getDefault.getPathMatcher("glob:**.expect.scala")
@@ -124,7 +124,7 @@ class SemanticdbTests:
 
 end SemanticdbTests
 
-object SemanticdbTests:
+object SemanticdbTests with
   /** Prettyprint a text document with symbol occurrences next to each resolved identifier.
    *
    * Useful for testing purposes to ensure that SymbolOccurrence values make sense and are correct.

compiler/test/dotty/tools/dotc/util/StackTraceTest.scala

@@ -7,7 +7,7 @@ import scala.util.chaining.given
 import org.junit.Assert.{assertEquals, assertTrue}
 import org.junit.Test
 
-class StackTraceTest:
+class StackTraceTest with
   val CausedBy   = "Caused by: "
   val Suppressed = "Suppressed: "
 

compiler/test/dotty/tools/scripting/ScriptingTests.scala

@@ -10,7 +10,7 @@ import vulpix.TestConfiguration
 
 
 /** Runs all tests contained in `compiler/test-resources/repl/` */
-class ScriptingTests:
+class ScriptingTests with
   extension (str: String) def dropExtension =
     str.reverse.dropWhile(_ != '.').drop(1).reverse
 

scala3doc-testcases/src/tests/FilterTest.scala

@@ -1,6 +1,6 @@
 package tests
 
-trait FilterTestBaseTrait:
+trait FilterTestBaseTrait with
    /** doc */
   protected def protectetDefInheriteTrait(a: Int): String = ???
   /** doc */
@@ -20,7 +20,7 @@ trait FilterTestBaseTrait:
   /** doc */
   val publicValInheritedTrait = 567
 
-class FilterTestBase:
+class FilterTestBase with
   /** doc */
   sealed abstract class BInherited
   /** doc */
@@ -69,7 +69,7 @@ class FilterTestBase:
   /** doc */
   given namedMap: Map[String, Double] = Map.empty
 
-class FilterTest extends FilterTestBase with FilterTestBaseTrait:
+class FilterTest extends FilterTestBase with FilterTestBaseTrait with
   /** doc */
   sealed abstract class B
   /** doc */

scala3doc-testcases/src/tests/complexNames.scala

@@ -2,7 +2,7 @@ package tests
 
 package complexNames
 
-abstract class A:
+abstract class A with
   def ++(other: A): A
   def +:(other: Int): A
   def :+(other: Int): A

scala3doc-testcases/src/tests/deprecated.scala

@@ -1,7 +1,7 @@
 package tests
-package deprecated 
+package deprecated
 
-class A:
+class A with
   def defInt: Int = 1
   @deprecated(message = "1")
   def def1: 1 = 1
@@ -10,10 +10,10 @@ class A:
   val val1: 1 = 1
   var varInt: Int = 1
   var var1: 1 = 1
-  class InnerA:
+  class InnerA with
     val innerVal: Int = 1
 
-class B extends A:
+class B extends A with
   @deprecated(since = "1", message = "some reason")
   def x: Int = 1
   val y: Int = 1

scala3doc-testcases/src/tests/enumSignatures.scala

@@ -8,17 +8,17 @@ enum Enum1
   case B
   case C
 }
-enum Enum2(val i: Int):
+enum Enum2(val i: Int) with
   case A(val s: String) extends Enum2(1)
   case B(val t: String) extends Enum2(2)
   case C(val u: String) extends Enum2(3)
 
-enum Enum3(val param: Int):
+enum Enum3(val param: Int) with
   case A extends Enum3(1) with A
   case B extends Enum3(2)
   case C extends Enum3(3)
 
-enum Enum4[+T]:
+enum Enum4[+T] with
   case G(s: String)
   case B extends Enum4[Int] with A
   case C[V](s:String) extends Enum4[V]

scala3doc-testcases/src/tests/exports.scala

@@ -1,23 +1,23 @@
 package tests
-package exports 
+package exports
 
-class A:
+class A with
   def aDefInt: Int = 1
   def aDef1: 1 = 1
   val aValInt: Int = 1
   val aVal1: 1 = 1
   var aVarInt: Int = 1
   var aVar1: 1 = 1
 
-object X:
+object X with
   def xDefInt: Int = 1
   def xDef1: 1 = 1
   val xValInt: Int = 1
   val xVal1: 1 = 1
   var xVarInt: Int = 1
   var xVar1: 1 = 1
 
-class B:
+class B with
   val a = new A
   export a._
   export X._

scala3doc-testcases/src/tests/functionDRI.scala

@@ -18,16 +18,16 @@ def b(b: B) = 3
 // @targetName("c_b") def c(p: Seq[B]) = 7
 
 // scala3 doc right now is not differentiating between fields and nested classlikes
-// class C(val b: Int):
+// class C(val b: Int) with
 //   trait b
 
-class D:
-  trait b:
+class D with
+  trait b with
     def b = 8
   def b = 9
 
-class E:
-  class F:
+class E with
+  class F with
     def b = 10
-  object F:
+  object F with
     def b = 11

scala3doc-testcases/src/tests/genericMethods.scala

@@ -1,6 +1,6 @@
 package tests.genericMethods
 
-class Types:
+class Types with
   def orTypes(base: Int | String, nested: List[Int | Double] | Seq[String]): Unit
   = ???
   def andTypes(base: Int & String, nested: List[Int & Double] & Seq[String]): Unit

scala3doc-testcases/src/tests/givenDRI.scala

@@ -20,14 +20,14 @@ given A[C] with {}
 
 given [S <: C]: A[S] with {}
 
-class R:
+class R with
   def a = 1
 
 given RR: A[Int] with
   def a = 2
 
-class S:
-  class R:
+class S with
+  class R with
     def a = 3
 
   given R: A[Int] with

scala3doc-testcases/src/tests/implicitMembers.scala

@@ -2,10 +2,10 @@ package tests
 
 package implicitMembers
 
-class OuterClass:
+class OuterClass with
   class ImplicitMemberTarget
 
-  object ImplicitMemberTarget:
+  object ImplicitMemberTarget with
     extension (a: ImplicitMemberTarget)
       def extensionFromCompanion: String =
         "ImplicitMemberTarget"

scala3doc-testcases/src/tests/links.scala

@@ -1,6 +1,6 @@
 package tests.links
 
-object AnObject:
+object AnObject with
   def method(a: Int): Int
     = 123 + a
   val field =
@@ -11,6 +11,6 @@ object AnObject:
  * [[tests.links.AnObject]]
 
  */
-class LinksTest:
+class LinksTest with
   def verifyIfLinksTestIsGenerated(b: Int): Int
     = 123