Add a test for i23852 and fix previous tests to handle inherited fields

Author: jchyb

sbt-test/macros/i23852/Components.scala

@@ -0,0 +1,9 @@
+object Components extends App {
+  try {
+    wire[Dep]
+  } catch {
+    case e: Throwable =>
+      e.printStackTrace()
+      sys.exit(-1)
+  }
+}

sbt-test/macros/i23852/Dep.scala

@@ -0,0 +1 @@
+class Dep()

sbt-test/macros/i23852/Dep.scala-added

@@ -0,0 +1 @@
+class Dep(int: Int)

sbt-test/macros/i23852/macro.scala

@@ -0,0 +1,16 @@
+import scala.quoted.*
+
+inline def wire[T]: T = ${ wireImpl[T] }
+def wireImpl[T: Type](using q: Quotes): Expr[T] = {
+  import q.reflect.*
+
+  lazy val targetType = TypeRepr.of[T]
+  val constructorValue = targetType.typeSymbol.primaryConstructor
+  val constructionMethodTree: Term = {
+    val ctor = Select(New(TypeIdent(targetType.typeSymbol)), constructorValue)
+    if (targetType.typeArgs.isEmpty) ctor else ctor.appliedToTypes(targetType.typeArgs)
+  }
+  val constructorArgsValue = List(Nil)
+  val code: Tree = constructorArgsValue.foldLeft(constructionMethodTree)((acc: Term, args: List[Term]) => Apply(acc, args))
+  code.asExprOf[T]
+}

sbt-test/macros/i23852/project/DottyInjectedPlugin.scala

@@ -0,0 +1,11 @@
+import sbt._
+import Keys._
+
+object DottyInjectedPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  override val projectSettings = Seq(
+    scalaVersion := sys.props("plugin.scalaVersion")
+  )
+}

sbt-test/macros/i23852/test

@@ -0,0 +1,3 @@
+> run
+$ copy-file Dep.scala-added Dep.scala
+-> compile

sbt-test/macros/macro-type-change-2/macros/Macros.scala

@@ -8,7 +8,7 @@ object Macros {
   def hasAnyFieldImpl[T: Type](using Quotes): Expr[Boolean] = {
     import quotes.reflect.*
 
-    val hasField = TypeRepr.of[T].typeSymbol.declaredFields.nonEmpty
+    val hasField = TypeRepr.of[T].typeSymbol.fieldMembers.nonEmpty
 
     Expr(hasField)
   }

sbt-test/macros/macro-type-change-3/macros/Macros.scala

@@ -8,7 +8,7 @@ object Macros {
   def hasAnyFieldImpl[T: Type](using Quotes): Expr[Boolean] = {
     import quotes.reflect.*
 
-    val hasField = TypeRepr.of[T].typeSymbol.declaredFields.nonEmpty
+    val hasField = TypeRepr.of[T].typeSymbol.fieldMembers.nonEmpty
 
     Expr(hasField)
   }

sbt-test/macros/macro-type-change-4/macros/Macros.scala

@@ -8,7 +8,7 @@ object Macros {
   def hasAnyFieldImpl[T: Type](placeholder: Expr[Boolean])(using Quotes): Expr[Boolean] = {
     import quotes.reflect.*
 
-    val hasField = TypeRepr.of[T].typeSymbol.declaredFields.nonEmpty
+    val hasField = TypeRepr.of[T].typeSymbol.fieldMembers.nonEmpty
 
     Expr(hasField)
   }

sbt-test/macros/macro-type-change/macros/Macros.scala

@@ -8,7 +8,7 @@ object Macros {
   def hasAnyFieldImpl[T: Type](using Quotes): Expr[Boolean] = {
     import quotes.reflect.*
 
-    val hasField = TypeRepr.of[T].typeSymbol.declaredFields.nonEmpty
+    val hasField = TypeRepr.of[T].typeSymbol.fieldMembers.nonEmpty
 
     Expr(hasField)
   }