Remove need for -Yretain-trees

Author: nicolasstucki

tests/neg-macros/annot-codegen.check

@@ -1,11 +1,11 @@
 
--- Error: tests/neg-macros/annot-codegen/Test_2.scala:9:4 --------------------------------------------------------------
-9 |    new Bar("", two, 1, 1.0) // error: body needs to be replaced
+-- Error: tests/neg-macros/annot-codegen/Test_2.scala:7:4 --------------------------------------------------------------
+7 |    new Bar("", two, 1, 1.0) // error: body needs to be replaced
   |    ^^^^^^^^^^^^^^^^^^^^^^^^
   |    Replace the underline code by:
   |    data.generated[Bar]()
--- Error: tests/neg-macros/annot-codegen/Test_2.scala:3:80 -------------------------------------------------------------
-3 |@data class Bar(val one: String, val two: Int, val three: Int, val four: Double): // error: additional methods needed
+-- Error: tests/neg-macros/annot-codegen/Test_2.scala:1:80 -------------------------------------------------------------
+1 |@data class Bar(val one: String, val two: Int, val three: Int, val four: Double): // error: additional methods needed
   |                                                                                ^
   |                                                     @data requires the following additional method(s):
   |

tests/neg-macros/annot-codegen/Macro_1.scala

@@ -19,24 +19,23 @@ class data extends MacroAnnotation:
           val withParam = With(param)
           val paramType = cls.declaredField(param).info
           val existingOpt =
-            cls.declaredMethod(withParam).find(o =>
-              val paramss = o.paramSymss
-              paramss.size == 1 && paramss(0).size == 1
+            cdef.body.find(stat =>
+              val paramss = stat.symbol.paramSymss
+              stat.symbol.name == withParam
+              && paramss.size == 1 && paramss(0).size == 1
               && paramss(0)(0).name == param // FIXME: if the parameter name is incorrect, propose rewriting it
               && paramss(0)(0).info == paramType // FIXME: if the parameter type changed, propose rewriting it
             )
           existingOpt match
-            case Some(existing) => existing.tree match
-              case tree: DefDef =>
-                tree.rhs match
+            case Some(tree: DefDef) =>
+              tree.rhs match
                 case Some(rhs) => rhs.asExpr match
                   case '{data.generated[t]()} =>
                     // The correct method is already present, nothing to do
                   case _ =>
                     report.error(s"Replace the underline code by:\n$expectedBody", rhs.pos)
                 case _ =>
-                  report.error("FIXME: Passing -Yretain-trees is currently needed for this macro to work")
-              case _ =>
+                  report.error(s"Replace the underline code by:\n${tree.show} = $expectedBody", tree.pos)
             case _ =>
               // The method is not present
               classPatches +=

tests/neg-macros/annot-codegen/Test_2.scala

@@ -1,9 +1,9 @@
-// scalac: -Yretain-trees
-
 @data class Bar(val one: String, val two: Int, val three: Int, val four: Double): // error: additional methods needed
   // This definition is OK and will be left as is
   def withOne(one: String): Bar =
     data.generated[Bar]()
 
   def withTwo(two: Int): Bar =
     new Bar("", two, 1, 1.0) // error: body needs to be replaced
+
+  def withThree(three: Int): Bar // error: body needs to be data.generate[Bar]()