scala · nicolasstucki · Aug 17, 2023 · Aug 16, 2023
diff --git a/compiler/test/dotty/tools/utils.scala b/compiler/test/dotty/tools/utils.scala
@@ -80,13 +80,15 @@ def toolArgsFor(tool: ToolName)(lines: List[String]): List[String] =
 // scalac: arg1 arg2, with alternative opening, optional space, alt names, text that is not */ up to end.
 // groups are (name, args)
 private val toolArg = raw"(?://|/\*| \*) ?(?i:(${ToolName.values.mkString("|")})):((?:[^*]|\*(?!/))*)".r.unanchored
+private val directiveOptionsArg = raw"//> using options (.*)".r.unanchored
 
 // Inspect the lines for compiler options of the form
 // `// scalac: args`, `/* scalac: args`, ` * scalac: args`.
 // If args string ends in close comment, stop at the `*` `/`.
 // Returns all the matches by the regex.
 def toolArgsParse(lines: List[String]): List[(String,String)] =
-  lines.flatMap { case toolArg(name, args) => List((name, args)) case _ => Nil }
+  lines.flatMap { case toolArg(name, args) => List((name, args)) case _ => Nil } ++
+  lines.flatMap { case directiveOptionsArg(args) => List(("scalac", args)) case _ => Nil }
 
 import org.junit.Test
 import org.junit.Assert._

diff --git a/tests/explicit-nulls/neg-patmat/match-pat.scala b/tests/explicit-nulls/neg-patmat/match-pat.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 class Foo {
 

diff --git a/tests/explicit-nulls/pos/i14682.scala b/tests/explicit-nulls/pos/i14682.scala
@@ -1,4 +1,4 @@
-// scalac: -Ysafe-init
+//> using options -Ysafe-init
 
 class C1:
   sealed abstract class Name {

diff --git a/tests/explicit-nulls/pos/i14947.scala b/tests/explicit-nulls/pos/i14947.scala
@@ -1,4 +1,4 @@
-// scalac: -Ytest-pickler -Xprint-types
+//> using options -Ytest-pickler -Xprint-types
 
 class B:
   def g: String | Null = ???

diff --git a/tests/explicit-nulls/pos/match-pat.scala b/tests/explicit-nulls/pos/match-pat.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 // Ensure we don't get "the type test for argType cannot be checked at runtime" warning
 

diff --git a/tests/explicit-nulls/pos/unsafe-match-null-pat.scala b/tests/explicit-nulls/pos/unsafe-match-null-pat.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 import scala.language.unsafeNulls
 

diff --git a/tests/neg-custom-args/wildcards.scala b/tests/neg-custom-args/wildcards.scala
@@ -1,4 +1,4 @@
-// scalac: -source future -deprecation -Xfatal-warnings
+//> using options -source future -deprecation -Xfatal-warnings
 
 object Test {
   val xs: List[_] = List(1, 2, 3)  // error

diff --git a/tests/neg-macros/i16355a.scala b/tests/neg-macros/i16355a.scala
@@ -1,4 +1,3 @@
-//> using scala "3.2.1"
 import scala.quoted.Expr
 import scala.quoted.Type
 import scala.quoted.quotes

diff --git a/tests/neg-macros/i9570.scala b/tests/neg-macros/i9570.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 import scala.quoted.*
 

diff --git a/tests/neg-macros/macro-deprecation.scala b/tests/neg-macros/macro-deprecation.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings -deprecation
+//> using options -Xfatal-warnings -deprecation
 
 import scala.quoted.*
 

diff --git a/tests/neg-macros/macro-experimental.scala b/tests/neg-macros/macro-experimental.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 import scala.quoted.*
 import scala.annotation.experimental

diff --git a/tests/neg-scalajs/enumeration-warnings.scala b/tests/neg-scalajs/enumeration-warnings.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 class UnableToTransformValue extends Enumeration {
   val a = {

diff --git a/tests/neg/14034.scala b/tests/neg/14034.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 import annotation.experimental
 

diff --git a/tests/neg/14034b.scala b/tests/neg/14034b.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings -deprecation
+//> using options -Xfatal-warnings -deprecation
 
 @deprecated trait Exp
 @deprecated val exp = 1

diff --git a/tests/neg/15981.scala b/tests/neg/15981.scala
@@ -1,4 +1,4 @@
-// scalac: -Werror
+//> using options -Werror
 val _ = locally{
   sealed abstract class PosInt(val value: Int) {
     override def equals(any: Any): Boolean = any.isInstanceOf[PosInt] // error

diff --git a/tests/neg/17284.scala b/tests/neg/17284.scala
@@ -1,4 +1,4 @@
-// scalac: -Werror -explain
+//> using options -Werror -explain
 
 def test =
   451.synchronized {} // error

diff --git a/tests/neg/18031.scala b/tests/neg/18031.scala
@@ -1,4 +1,4 @@
-// scalac: -source:future
+//> using options -source:future
 
 object A:
   val x, y, z = 0

diff --git a/tests/neg/IsInstanceOfClassTag.scala b/tests/neg/IsInstanceOfClassTag.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 import scala.reflect.ClassTag
 

diff --git a/tests/neg/IsInstanceOfClassTag2.scala b/tests/neg/IsInstanceOfClassTag2.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 import scala.reflect.TypeTest
 

diff --git a/tests/neg/adhoc-extension/B.scala b/tests/neg/adhoc-extension/B.scala
@@ -1,4 +1,4 @@
-// scalac: -source future -feature -Xfatal-warnings
+//> using options -source future -feature -Xfatal-warnings
 
 package adhoc
 class B extends A  // error: adhoc-extension (under -strict -feature -Xfatal-warnings)

diff --git a/tests/neg/autoTuplingTestb.scala b/tests/neg/autoTuplingTestb.scala
@@ -1,4 +1,4 @@
-// scalac: -language:noAutoTupling
+//> using options -language:noAutoTupling
 
 object autoTupling {
 

diff --git a/tests/neg/avoid-warn-deprecation.scala b/tests/neg/avoid-warn-deprecation.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings -feature
+//> using options -Xfatal-warnings -feature
 
 object A {
   @deprecated("use bar instead of this one", "0.2.3")

diff --git a/tests/neg/by-name.scala b/tests/neg/by-name.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 def f(x: => Int, erased y: => Int) = x // error
 def g(erased x: => Int, y: => Int) = y // error

diff --git a/tests/neg/capt-wf.scala b/tests/neg/capt-wf.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.captureChecking -Xfatal-warnings
+//> using options -language:experimental.captureChecking -Xfatal-warnings
 
 class C
 type Cap = C^

diff --git a/tests/neg/classtag-typetest/3_1-migration.scala b/tests/neg/classtag-typetest/3_1-migration.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 import scala.language.`future-migration`
 import scala.reflect.ClassTag

diff --git a/tests/neg/classtag-typetest/3_1.scala b/tests/neg/classtag-typetest/3_1.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 import scala.language.future
 import scala.reflect.ClassTag

diff --git a/tests/neg/constructor-proxy-shadowing.scala b/tests/neg/constructor-proxy-shadowing.scala
@@ -1,4 +1,4 @@
-// scalac: -explain
+//> using options -explain
 
 object Test extends App {
   def A22(s: String): String = s

diff --git a/tests/neg/convertible.scala b/tests/neg/convertible.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings -feature
+//> using options -Xfatal-warnings -feature
 
 import language.experimental.into
 

diff --git a/tests/neg/deptypes.scala b/tests/neg/deptypes.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.dependent
+//> using options -language:experimental.dependent
 
 type Vec[T] = (n: Int) =>> Array[T] // error: not yet implemented
 

diff --git a/tests/neg/enum-variance.scala b/tests/neg/enum-variance.scala
@@ -1,4 +1,4 @@
-// scalac: -Xfatal-warnings
+//> using options -Xfatal-warnings
 
 enum View[-T]:
   case Refl(f: T => T) // error: enum case Refl requires explicit declaration of type T

diff --git a/tests/neg/erased-1.scala b/tests/neg/erased-1.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   def foo0(a: Int): Int = a

diff --git a/tests/neg/erased-2.scala b/tests/neg/erased-2.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   def foo0(a: Int): Int = a

diff --git a/tests/neg/erased-24.scala b/tests/neg/erased-24.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 // Could become a run test if we had totality checking for erased arguments
 

diff --git a/tests/neg/erased-3.scala b/tests/neg/erased-3.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   def foo0(a: Int): Int = a

diff --git a/tests/neg/erased-4.scala b/tests/neg/erased-4.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
 

diff --git a/tests/neg/erased-5.scala b/tests/neg/erased-5.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
 

diff --git a/tests/neg/erased-6.scala b/tests/neg/erased-6.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   erased def foo: Foo = new Foo

diff --git a/tests/neg/erased-args-lifted.scala b/tests/neg/erased-args-lifted.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   def foo(a: Int)(b: Int, c: Int) = 42

diff --git a/tests/neg/erased-assign.scala b/tests/neg/erased-assign.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   var i: Int = 1

diff --git a/tests/neg/erased-case-class.scala b/tests/neg/erased-case-class.scala
@@ -1,3 +1,3 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 case class Foo1(erased x: Int) // error // error
diff --git a/tests/neg/erased-def-rhs.scala b/tests/neg/erased-def-rhs.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   def f(erased i: Int) = {

diff --git a/tests/neg/erased-if-else.scala b/tests/neg/erased-if-else.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   var b = true

diff --git a/tests/neg/erased-implicit.scala b/tests/neg/erased-implicit.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
 

diff --git a/tests/neg/erased-in-tuples.scala b/tests/neg/erased-in-tuples.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 @main def Test() =
   val x = 5

diff --git a/tests/neg/erased-lazy-val.scala b/tests/neg/erased-lazy-val.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   erased lazy val i: Int = 1 // error

diff --git a/tests/neg/erased-machine-state-encoding-with-inline.scala b/tests/neg/erased-machine-state-encoding-with-inline.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 import scala.compiletime.*
 

diff --git a/tests/neg/erased-match.scala b/tests/neg/erased-match.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   var b = true

diff --git a/tests/neg/erased-object.scala b/tests/neg/erased-object.scala
@@ -1,3 +1,3 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 erased object Test // error
diff --git a/tests/neg/erased-path.scala b/tests/neg/erased-path.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 trait Sys { type X }
 

diff --git a/tests/neg/erased-pathdep-1.scala b/tests/neg/erased-pathdep-1.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 // Could become a neg test if we had totality checking for erased arguments
 

diff --git a/tests/neg/erased-pathdep-2.scala b/tests/neg/erased-pathdep-2.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 // Could become a neg test if we had totality checking for erased arguments
 

diff --git a/tests/neg/erased-return.scala b/tests/neg/erased-return.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   var b = true

diff --git a/tests/neg/erased-singleton.scala b/tests/neg/erased-singleton.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 trait Sys
 

diff --git a/tests/neg/erased-try.scala b/tests/neg/erased-try.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   def foo(erased a: Int): Int = {

diff --git a/tests/neg/erased-type.scala b/tests/neg/erased-type.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 class Test {
   erased type T // error

diff --git a/tests/neg/erased-val-rhs.scala b/tests/neg/erased-val-rhs.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   def f(erased i: Int) = {

diff --git a/tests/neg/erased-value-class.scala b/tests/neg/erased-value-class.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 class Foo(erased x: Int) extends AnyVal // error
 

diff --git a/tests/neg/erased-var.scala b/tests/neg/erased-var.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 object Test {
   erased var i: Int = 1 // error

diff --git a/tests/neg/erasedValueb.scala b/tests/neg/erasedValueb.scala
@@ -1,4 +1,4 @@
-// scalac: -language:experimental.erasedDefinitions
+//> using options -language:experimental.erasedDefinitions
 
 import scala.compiletime.erasedValue
 object Test {

diff --git a/tests/neg/experimental-2.scala b/tests/neg/experimental-2.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 class Test7 {
   import scala.language.experimental

diff --git a/tests/neg/experimental-erased.scala b/tests/neg/experimental-erased.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 import language.experimental.erasedDefinitions
 import annotation.experimental

diff --git a/tests/neg/experimental-imports.scala b/tests/neg/experimental-imports.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 import annotation.experimental
 

diff --git a/tests/neg/experimental-nested-imports-2.scala b/tests/neg/experimental-nested-imports-2.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 import annotation.experimental
 

diff --git a/tests/neg/experimental-nested-imports-3.scala b/tests/neg/experimental-nested-imports-3.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 import annotation.experimental
 

diff --git a/tests/neg/experimental-nested-imports.scala b/tests/neg/experimental-nested-imports.scala
@@ -1,4 +1,4 @@
-// scalac: -Yno-experimental
+//> using options -Yno-experimental
 
 import annotation.experimental