Simplify macro tests with custom args

[Cherry-picked cc90bf3][modified]

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

@@ -29,10 +29,6 @@ class BootstrappedOnlyCompilationTests {
     aggregateTests(
       compileFilesInDir("tests/bench", defaultOptions.without("-Yno-deep-subtypes")),
       compileFilesInDir("tests/pos-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/pos-custom-args/semanticdb", defaultOptions.and("-Xsemanticdb")),
-      compileDir("tests/pos-special/i7592", defaultOptions.and("-Yretain-trees")),
-      compileDir("tests/pos-special/i11331.1", defaultOptions),
-      compileDir("tests/pos-custom-args/i13405", defaultOptions.and("-Xfatal-warnings")),
     ).checkCompile()
   }
 
@@ -107,12 +103,8 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def negMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("compileNegWithCompiler")
-    aggregateTests(
-      compileFilesInDir("tests/neg-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFile("tests/pos-macros/i9570.scala", defaultOptions.and("-Xfatal-warnings")),
-      compileFile("tests/pos-macros/macro-deprecation.scala", defaultOptions.and("-Xfatal-warnings", "-deprecation")),
-      compileFile("tests/pos-macros/macro-experimental.scala", defaultOptions.and("-Yno-experimental")),
-    ).checkExpectedErrors()
+    compileFilesInDir("tests/neg-macros", defaultOptions.and("-Xcheck-macros"))
+      .checkExpectedErrors()
   }
 
   @Test def negWithCompiler: Unit = {
@@ -127,15 +119,9 @@ class BootstrappedOnlyCompilationTests {
 
   @Test def runMacros: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runMacros")
-    aggregateTests(
-      compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros")),
-      compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees"),
-      compileFilesInDir("tests/run-custom-args/Yread-comments", defaultOptions and "-Yread-docs"),
-      compileFilesInDir("tests/run-custom-args/run-macros-erased", defaultOptions.and("-language:experimental.erasedDefinitions").and("-Xcheck-macros")),
-      compileDir("tests/run-custom-args/Xmacro-settings/simple", defaultOptions.and("-Xmacro-settings:one,two,three")),
-      compileDir("tests/run-custom-args/Xmacro-settings/compileTimeEnv", defaultOptions.and("-Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO")),
-    )
-  }.checkRuns()
+    compileFilesInDir("tests/run-macros", defaultOptions.and("-Xcheck-macros"))
+      .checkRuns()
+  }
 
   @Test def runWithCompiler: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runWithCompiler")

tests/pos-macros/i9570.scala → tests/neg-macros/i9570.scala

@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings
+
 import scala.quoted.*
 
 object Macros {

tests/pos-macros/macro-deprecation.scala → tests/neg-macros/macro-deprecation.scala

@@ -1,3 +1,5 @@
+// scalac: -Xfatal-warnings -deprecation
+
 import scala.quoted.*
 
 inline def f = ${ impl } // error

tests/pos-macros/macro-experimental.scala → tests/neg-macros/macro-experimental.scala

@@ -1,3 +1,5 @@
+// scalac: -Yno-experimental
+
 import scala.quoted.*
 import scala.annotation.experimental
 

tests/neg/i9685bis.check

@@ -0,0 +1,9 @@
+-- [E008] Not Found Error: tests/neg/i9685bis.scala:25:4 ---------------------------------------------------------------
+25 |  1.asdf // error
+   |  ^^^^^^
+   |  value asdf is not a member of Int, but could be made available as an extension method.
+   |
+   |  The following import might make progress towards fixing the problem:
+   |
+   |    import foo.Baz.toBaz
+   |

tests/neg/i9685bis.scala

@@ -0,0 +1,25 @@
+// scalac: -source future
+
+package foo
+
+import scala.language.implicitConversions
+
+class Foo
+
+object Foo:
+
+  inline implicit def toFoo(x: Int): Foo = Foo()
+
+class Bar
+
+object Bar:
+  inline given Conversion[Int, Bar] with
+    def apply(x: Int): Bar = Bar()
+
+class Baz
+
+object Baz:
+  transparent inline implicit def toBaz(x: Int): Baz = Baz()
+
+object Usage:
+  1.asdf // error

tests/pos-macros/i13405/Test.scala

@@ -0,0 +1,3 @@
+// scalac: -Xfatal-warnings
+
+@main def main: Unit = hh()

tests/pos-special/i7592/Test_2.scala → tests/pos-macros/i7592/Test_2.scala

@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 def return1 = 1
 
 def testReturn1 = {

tests/pos-custom-args/semanticdb/inline-unapply/App_2.scala → tests/pos-macros/semanticdb-inline-unapply/App_2.scala

@@ -1,3 +1,4 @@
+// scalac: -Xsemanticdb
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/pos-custom-args/semanticdb/inline-unapply/Macro_1.scala → tests/pos-macros/semanticdb-inline-unapply/Macro_1.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import scala.quoted.*
 
 object Succ:

tests/pos-custom-args/semanticdb/macro-pos/example_1.scala → tests/pos-macros/semanticdb-macro-pos/example_1.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object CodeImpl {

tests/pos-custom-args/semanticdb/macro-pos/example_2.scala → tests/pos-macros/semanticdb-macro-pos/example_2.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 import quoted.*
 
 object TestImpl {

tests/pos-custom-args/semanticdb/macro-pos/example_3.scala → tests/pos-macros/semanticdb-macro-pos/example_3.scala

@@ -1,3 +1,5 @@
+// scalac: -Xsemanticdb
+
 object Test {
 
   def test = TestImpl.fun("")

tests/run-custom-args/Xmacro-settings/compileTimeEnv/Test.scala → tests/run-macros/Xmacro-settings-compileTimeEnv/Test.scala

@@ -1,3 +1,5 @@
+// scalac: -Xmacro-settings:a,b=1,c.b.a=x.y.z=1,myLogger.level=INFO
+
 import scala.compiletime.*
 
 object Test {
@@ -16,10 +18,10 @@ object Test {
   }
 
   def runBasic(): Unit = {
-    printEnv("a")    
-    printEnv("b")    
-    printEnv("c.b.a")    
-    printEnv("wat")    
+    printEnv("a")
+    printEnv("b")
+    printEnv("c.b.a")
+    printEnv("wat")
   }
 
   inline def printEnv(inline k: String): Unit =

tests/run-custom-args/Xmacro-settings/simple/Test.scala → tests/run-macros/Xmacro-settings-simple/Test.scala

@@ -1,3 +1,5 @@
+// scalac: -Xmacro-settings:one,two,three
+
 import x.*
 
 object Test {

tests/run-custom-args/Yread-comments/i12351/Test_2.scala → tests/run-macros/i12351/Test_2.scala

@@ -1,3 +1,5 @@
+// scalac: -Yread-docs
+
 @main def Test(): Unit = {
     println(getDocString[Data])
     assert(getDocString[Data].nonEmpty)

tests/run-custom-args/Yread-comments/i12352/Main.scala → tests/run-macros/i12352/Main.scala

@@ -1,3 +1,5 @@
+// scalac: -Yread-docs
+
 @main def Test(): Unit = {
     val res = getDocString[scala.quoted.Quotes]
     println(res)

tests/run-macros/i17105b.check

@@ -0,0 +1,3 @@
+case erased: [erased case]
+case erased nested: c
+case erased nested 2: d

tests/run-macros/i17105b/Macro_1.scala

@@ -0,0 +1,27 @@
+import scala.language.experimental.erasedDefinitions
+
+import scala.quoted.*
+
+inline def testExpr(inline body: Any) = ${ testExprImpl('body) }
+def testExprImpl(body: Expr[Any])(using Quotes): Expr[String] =
+  body match
+    // Erased Types
+    case '{ def erasedfn(y: String) = "placeholder"; $a(erasedfn): String } =>
+      Expr("This case should not match")
+    case '{ def erasedfn(erased y: String) = "placeholder"; $a(erasedfn): String } =>
+      '{ $a((erased z: String) => "[erased case]") }
+    case '{
+      def erasedfn(a: String, b: String)(c: String, d: String): String = a
+      $y(erasedfn): String
+    } => Expr("This should not match")
+    case '{
+      def erasedfn(a: String, erased b: String)(erased c: String, d: String): String = a
+      $y(erasedfn): String
+    } =>
+      '{ $y((a: String, erased b: String) => (erased c: String, d: String) => d) }
+    case '{
+      def erasedfn(a: String, erased b: String)(c: String, erased d: String): String = a
+      $y(erasedfn): String
+    } =>
+      '{ $y((a: String, erased b: String) => (c: String, erased d: String) => c) }
+    case _ => Expr("not matched")

tests/run-macros/i17105b/Test_2.scala

@@ -0,0 +1,12 @@
+import scala.language.experimental.erasedDefinitions
+
+@main def Test: Unit =
+  println("case erased: " + testExpr { def erasedfn1(erased x: String) = "placeholder"; erasedfn1("arg1")})
+  println("case erased nested: " + testExpr {
+    def erasedfn2(p: String, erased q: String)(r: String, erased s: String) = p
+    erasedfn2("a", "b")("c", "d")
+  })
+  println("case erased nested 2: " + testExpr {
+    def erasedfn2(p: String, erased q: String)(erased r: String, s: String) = p
+    erasedfn2("a", "b")("c", "d")
+  })

tests/run-custom-args/run-macros-erased/macro-erased/1.scala → tests/run-macros/macro-erased/Macro_1.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 import scala.quoted.*
 
 object Macro {

tests/run-custom-args/run-macros-erased/reflect-isFunctionType/test_2.scala → tests/run-macros/reflect-isFunctionType/test_2.scala

@@ -1,3 +1,5 @@
+import scala.language.experimental.erasedDefinitions
+
 trait Box {
   type T
 }

tests/run-macros/tasty-definitions-1/quoted_2.scala

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/run-custom-args/Yretain-trees/tasty-definitions-2/Test_2.scala → tests/run-macros/tasty-definitions-2/Test_2.scala

@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 object Test {
   def main(args: Array[String]): Unit = {
     println(Foo.inspectBody(Foo.foo))

tests/run-custom-args/Yretain-trees/tasty-definitions-3/Test_2.scala → tests/run-macros/tasty-definitions-3/Test_2.scala

@@ -1,3 +1,5 @@
+// scalac: -Yretain-trees
+
 object Test {
 
   def main(args: Array[String]): Unit = {

tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_2.scala → tests/run-macros/tasty-extractors-owners/quoted_2.scala

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 import Macros.*
 

tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_2.scala → tests/run-macros/tasty-load-tree-1/quoted_2.scala

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {

tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_2.scala → tests/run-macros/tasty-load-tree-2/quoted_2.scala

@@ -1,3 +1,4 @@
+// scalac: -Yretain-trees
 
 object Test {
   def main(args: Array[String]): Unit = {