Stabilise Quotes reflect methods used for creating new classes/objects

jchyb · jchyb · commit 7f787bebe290 · 2025-08-27T12:35:50.000+02:00
diff --git a/library/src/scala/quoted/Quotes.scala b/library/src/scala/quoted/Quotes.scala
@@ -493,7 +493,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        *  @param body List of members of the class. The members must align with the members of `cls`.
        */
       // TODO add selfOpt: Option[ValDef]?
-      @experimental def apply(cls: Symbol, parents: List[Tree /* Term | TypeTree */], body: List[Statement]): ClassDef
+      // ^ if a use-case shows up, we add this via an overloaded method
+      def apply(cls: Symbol, parents: List[Tree /* Term | TypeTree */], body: List[Statement]): ClassDef
       def copy(original: Tree)(name: String, constr: DefDef, parents: List[Tree /* Term | TypeTree */], selfOpt: Option[ValDef], body: List[Statement]): ClassDef
       def unapply(cdef: ClassDef): (String, DefDef, List[Tree /* Term | TypeTree */], Option[ValDef], List[Statement])
 
@@ -518,7 +519,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        *  @syntax markdown
        */
       // TODO add selfOpt: Option[ValDef]?
-      @experimental def module(module: Symbol, parents: List[Tree /* Term | TypeTree */], body: List[Statement]): (ValDef, ClassDef)
+      // ^ if a use-case shows up, we can add this via an overloaded method
+      def module(module: Symbol, parents: List[Tree /* Term | TypeTree */], body: List[Statement]): (ValDef, ClassDef)
     }
 
     /** Makes extension methods on `ClassDef` available without any imports */
@@ -3878,7 +3880,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        *  @note As a macro can only splice code into the point at which it is expanded, all generated symbols must be
        *        direct or indirect children of the reflection context's owner.
        */
-      @experimental def newClass(owner: Symbol, name: String, parents: List[TypeRepr], decls: Symbol => List[Symbol], selfType: Option[TypeRepr]): Symbol
+       def newClass(owner: Symbol, name: String, parents: List[TypeRepr], decls: Symbol => List[Symbol], selfType: Option[TypeRepr]): Symbol
 
       /** Generates a new class symbol for a class with a public single term clause constructor.
        *
@@ -3936,7 +3938,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        *  @note As a macro can only splice code into the point at which it is expanded, all generated symbols must be
        *        direct or indirect children of the reflection context's owner.
        */
-      @experimental def newClass(
+      def newClass(
         owner: Symbol,
         name: String,
         parents: Symbol => List[TypeRepr],
@@ -4038,7 +4040,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        */
       // Keep doc aligned with QuotesImpl's validFlags: `clsFlags` with `validClassFlags`, `conFlags` with `validClassConstructorFlags`,
       // conParamFlags with `validClassTypeParamFlags` and `validClassTermParamFlags`
-      @experimental def newClass(
+      def newClass(
         owner: Symbol,
         name: String,
         parents: Symbol => List[TypeRepr],
@@ -4110,7 +4112,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        *
        *  @syntax markdown
        */
-      @experimental def newModule(owner: Symbol, name: String, modFlags: Flags, clsFlags: Flags, parents: Symbol => List[TypeRepr], decls: Symbol => List[Symbol], privateWithin: Symbol): Symbol
+      def newModule(owner: Symbol, name: String, modFlags: Flags, clsFlags: Flags, parents: Symbol => List[TypeRepr], decls: Symbol => List[Symbol], privateWithin: Symbol): Symbol
 
       /** Generates a new method symbol with the given parent, name and type.
        *
@@ -4225,7 +4227,6 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
        *
        *  @param prefix Prefix of the fresh name
        */
-      @experimental
       def freshName(prefix: String): String
     }
 
diff --git a/tests/neg-macros/i19842-a.check b/tests/neg-macros/i19842-a.check
@@ -11,7 +11,7 @@
   |	at dotty.tools.dotc.transform.TreeChecker$.checkParents(TreeChecker.scala:210)
   |	at scala.quoted.runtime.impl.QuotesImpl$reflect$ClassDef$.module(QuotesImpl.scala:286)
   |	at scala.quoted.runtime.impl.QuotesImpl$reflect$ClassDef$.module(QuotesImpl.scala:285)
-  |	at Macros$.makeSerializer(Macro.scala:25)
+  |	at Macros$.makeSerializer(Macro.scala:23)
   |
   |---------------------------------------------------------------------------------------------------------------------
   |Inline stack trace
diff --git a/tests/neg-macros/i19842-a/Macro.scala b/tests/neg-macros/i19842-a/Macro.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.annotation.{experimental, targetName}
 import scala.quoted.*
 import scala.util.Try
diff --git a/tests/neg-macros/i19842-b.check b/tests/neg-macros/i19842-b.check
@@ -11,7 +11,7 @@
   |	at dotty.tools.dotc.transform.TreeChecker$.checkParents(TreeChecker.scala:210)
   |	at scala.quoted.runtime.impl.QuotesImpl$reflect$ClassDef$.module(QuotesImpl.scala:286)
   |	at scala.quoted.runtime.impl.QuotesImpl$reflect$ClassDef$.module(QuotesImpl.scala:285)
-  |	at Macros$.makeSerializer(Macro.scala:27)
+  |	at Macros$.makeSerializer(Macro.scala:25)
   |
   |---------------------------------------------------------------------------------------------------------------------
   |Inline stack trace
diff --git a/tests/neg-macros/i19842-b/Macro.scala b/tests/neg-macros/i19842-b/Macro.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.annotation.{experimental, targetName}
 import scala.quoted.*
 import scala.util.Try
diff --git a/tests/neg-macros/newClassExtendsNoParents/Macro_1.scala b/tests/neg-macros/newClassExtendsNoParents/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Any = ${ makeClassExpr('name) }
diff --git a/tests/neg-macros/newClassExtendsNoParents/Test_2.scala b/tests/neg-macros/newClassExtendsNoParents/Test_2.scala
@@ -1,3 +1 @@
-//> using options -experimental
-
 def test: Any = makeClass("foo") // error
diff --git a/tests/neg-macros/newClassExtendsOnlyTrait/Macro_1.scala b/tests/neg-macros/newClassExtendsOnlyTrait/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Foo = ${ makeClassExpr('name) }
diff --git a/tests/neg-macros/newClassExtendsOnlyTrait/Test_2.scala b/tests/neg-macros/newClassExtendsOnlyTrait/Test_2.scala
@@ -1,3 +1 @@
-//> using options -experimental
-
 def test: Foo = makeClass("foo") // error
diff --git a/tests/neg-macros/newClassParamsMissingArgument.check b/tests/neg-macros/newClassParamsMissingArgument.check
@@ -1,10 +1,10 @@
 
--- Error: tests/neg-macros/newClassParamsMissingArgument/Test_2.scala:4:2 ----------------------------------------------
-4 |  makeClass("foo") // error // error
+-- Error: tests/neg-macros/newClassParamsMissingArgument/Test_2.scala:2:2 ----------------------------------------------
+2 |  makeClass("foo") // error // error
   |  ^^^^^^^^^^^^^^^^
   |wrong number of arguments at inlining (while expanding macro) for (idx: Int): foo: (foo#<init> : (idx: Int): foo), expected: 1, found: 0
--- Error: tests/neg-macros/newClassParamsMissingArgument/Test_2.scala:4:11 ---------------------------------------------
-4 |  makeClass("foo") // error // error
+-- Error: tests/neg-macros/newClassParamsMissingArgument/Test_2.scala:2:11 ---------------------------------------------
+2 |  makeClass("foo") // error // error
   |  ^^^^^^^^^^^^^^^^
   |Malformed tree was found while expanding macro with -Xcheck-macros.
   |The tree does not conform to the compiler's tree invariants.
@@ -26,7 +26,7 @@
   |---------------------------------------------------------------------------------------------------------------------
   |Inline stack trace
   |- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  |This location contains code that was inlined from Macro_1.scala:5
-5 |inline def makeClass(inline name: String): Object = ${ makeClassExpr('name) }
+  |This location contains code that was inlined from Macro_1.scala:3
+3 |inline def makeClass(inline name: String): Object = ${ makeClassExpr('name) }
   |                                                    ^^^^^^^^^^^^^^^^^^^^^^^^^
    ---------------------------------------------------------------------------------------------------------------------
diff --git a/tests/neg-macros/newClassParamsMissingArgument/Macro_1.scala b/tests/neg-macros/newClassParamsMissingArgument/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted._
 
 inline def makeClass(inline name: String): Object = ${ makeClassExpr('name) }
diff --git a/tests/neg-macros/newClassParamsMissingArgument/Test_2.scala b/tests/neg-macros/newClassParamsMissingArgument/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   makeClass("foo") // error // error
 }
diff --git a/tests/run-macros/newClass/Macro_1.scala b/tests/run-macros/newClass/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Any = ${ makeClassExpr('name) }
diff --git a/tests/run-macros/newClass/Test_2.scala b/tests/run-macros/newClass/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val foo = makeClass("foo")
   println(foo.getClass)
diff --git a/tests/run-macros/newClassAnnotation/Macro_1.scala b/tests/run-macros/newClassAnnotation/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 import scala.annotation.StaticAnnotation
 
diff --git a/tests/run-macros/newClassAnnotation/Test_2.scala b/tests/run-macros/newClassAnnotation/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test =
   val (cls, str) = makeClass("name")
   println(str)
diff --git a/tests/run-macros/newClassExtends/Macro_1.scala b/tests/run-macros/newClassExtends/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Foo = ${ makeClassExpr('name) }
diff --git a/tests/run-macros/newClassExtends/Test_2.scala b/tests/run-macros/newClassExtends/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val foo: Foo = makeClass("foo")
   foo.foo()
diff --git a/tests/run-macros/newClassExtendsClassParams/Macro_1.scala b/tests/run-macros/newClassExtendsClassParams/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Foo = ${ makeClassExpr('name) }
diff --git a/tests/run-macros/newClassExtendsClassParams/Test_2.scala b/tests/run-macros/newClassExtendsClassParams/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val foo: Foo = makeClass("foo")
   foo.foo()
diff --git a/tests/run-macros/newClassExtendsJavaClass/Macro_1.scala b/tests/run-macros/newClassExtendsJavaClass/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 transparent inline def makeClass(inline name: String): JavaClass[Int] = ${ makeClassExpr('name) }
diff --git a/tests/run-macros/newClassExtendsJavaClass/Main_2.scala b/tests/run-macros/newClassExtendsJavaClass/Main_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val cls = makeClass("foo")
   println(cls.getClass)
diff --git a/tests/run-macros/newClassParams/Macro_1.scala b/tests/run-macros/newClassParams/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted._
 
 inline def makeClassAndCall(inline name: String, idx: Int, str: String): Unit = ${ makeClassAndCallExpr('name, 'idx, 'str) }
diff --git a/tests/run-macros/newClassParams/Test_2.scala b/tests/run-macros/newClassParams/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   makeClassAndCall("bar", 10, "test")
 }
diff --git a/tests/run-macros/newClassParamsExtendsClassParams/Macro_1.scala b/tests/run-macros/newClassParamsExtendsClassParams/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted._
 
 inline def makeClass(inline name: String): Foo = ${ makeClassExpr('name) }
diff --git a/tests/run-macros/newClassParamsExtendsClassParams/Test_2.scala b/tests/run-macros/newClassParamsExtendsClassParams/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val foo: Foo = makeClass("foo")
   foo.foo()
diff --git a/tests/run-macros/newClassSelf/Macro_1.scala b/tests/run-macros/newClassSelf/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 inline def makeClass(inline name: String): Bar = ${ makeClassExpr('name) }
diff --git a/tests/run-macros/newClassSelf/Test_2.scala b/tests/run-macros/newClassSelf/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val a: Bar = makeClass("A")
   a.bar()
diff --git a/tests/run-macros/newClassTraitAndAbstract/Macro_1.scala b/tests/run-macros/newClassTraitAndAbstract/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 transparent inline def makeTrait(inline name: String): Any = ${ makeTraitExpr('name) }
diff --git a/tests/run-macros/newClassTraitAndAbstract/Test_2.scala b/tests/run-macros/newClassTraitAndAbstract/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val (cls1, show1) = makeTrait("foo")
   println(cls1.getClass)
diff --git a/tests/run-macros/newClassTypeParams/Macro_1.scala b/tests/run-macros/newClassTypeParams/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 transparent inline def makeClass(inline name: String): Any = ${ makeClassExpr('name) }
diff --git a/tests/run-macros/newClassTypeParams/Test_2.scala b/tests/run-macros/newClassTypeParams/Test_2.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 @main def Test: Unit = {
   val (cls, show) = makeClass("foo")
   println(cls.getClass)
diff --git a/tests/run-macros/newClassTypeParamsDoc/Macro_1.scala b/tests/run-macros/newClassTypeParamsDoc/Macro_1.scala
@@ -1,5 +1,3 @@
-//> using options -experimental
-
 import scala.quoted.*
 
 transparent inline def makeClass(): Any = ${ makeClassExpr }
diff --git a/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala b/tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala
@@ -66,14 +66,8 @@ val experimentalDefinitionInLibrary = Set(
   //// New APIs: Quotes
   // Can be stabilized in 3.5.0 (unsure) or later
   "scala.quoted.Quotes.reflectModule.CompilationInfoModule.XmacroSettings",
-  // Cant be stabilized yet.
-  // Need newClass variant that can add constructor parameters.
-  // Need experimental annotation macros to check that design works.
-  "scala.quoted.Quotes.reflectModule.ClassDefModule.apply",
-  "scala.quoted.Quotes.reflectModule.ClassDefModule.module",
-  "scala.quoted.Quotes.reflectModule.SymbolModule.newClass",
-  "scala.quoted.Quotes.reflectModule.SymbolModule.newModule",
-  "scala.quoted.Quotes.reflectModule.SymbolModule.freshName",
+  // Would need an asSeenFrom and ClassInfo added, which we generally do not want
+  // We need to think if this is necessary, and if so, think of an replacement
   "scala.quoted.Quotes.reflectModule.SymbolMethods.info",
   // Added for 3.6.0, stabilize after feedback.
   "scala.quoted.Quotes.reflectModule.SymbolModule.newBoundedType",

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`\| at dotty.tools.dotc.transform.TreeChecker$.checkParents(TreeChecker.scala:210)`
`12`	`12`	`\| at scala.quoted.runtime.impl.QuotesImpl$reflect$ClassDef$.module(QuotesImpl.scala:286)`
`13`	`13`	`\| at scala.quoted.runtime.impl.QuotesImpl$reflect$ClassDef$.module(QuotesImpl.scala:285)`
`14`		`- \| at Macros$.makeSerializer(Macro.scala:25)`
	`14`	`+ \| at Macros$.makeSerializer(Macro.scala:23)`
`15`	`15`	`\|`
`16`	`16`	`\|---------------------------------------------------------------------------------------------------------------------`
`17`	`17`	`\|Inline stack trace`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-//> using options -experimental`
`2`		`-`
`3`	`1`	`import scala.annotation.{experimental, targetName}`
`4`	`2`	`import scala.quoted.*`
`5`	`3`	`import scala.util.Try`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-//> using options -experimental`
`2`		`-`
`3`	`1`	`def test: Any = makeClass("foo") // error`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-//> using options -experimental`
`2`		`-`
`3`	`1`	`def test: Foo = makeClass("foo") // error`