Remove use of underlyingArgument

Author: nicolasstucki

shared/src/main/scala-3/verify/asserts/AssertEqualsMacro.scala

@@ -17,9 +17,9 @@ import language.experimental.macros
 
 trait AssertEquals[R] {
   protected def stringAssertEqualsListener: RecorderListener[String, R]
-  inline def assertEquals(expected: String, found: String): R =
+  inline def assertEquals(inline expected: String, inline found: String): R =
     ${ StringRecorderMacro.apply('expected, 'found, 'stringAssertEqualsListener) }
 
-  inline def assertEquals(expected: String, found: String, message: => String): R =
+  inline def assertEquals(inline expected: String, inline found: String, message: => String): R =
     ${ StringRecorderMacro.apply('expected, 'found, 'message, 'stringAssertEqualsListener) }
   }

shared/src/main/scala-3/verify/asserts/Recorder.scala

@@ -17,8 +17,8 @@ import language.experimental.macros
 
 abstract class Recorder[A, R] {
   protected def listener: RecorderListener[A, R]
-  inline def apply(value: A): R =
+  inline def apply(inline value: A): R =
     ${ RecorderMacro.apply('value, 'listener) }
-  inline def apply(value: A, message: => String): R =
+  inline def apply(inline value: A, message: => String): R =
     ${ RecorderMacro.apply('value, 'message, 'listener) }
 }

shared/src/main/scala-3/verify/asserts/RecorderMacro.scala

@@ -27,7 +27,7 @@ class RecorderMacro(using qctx0: Quotes) {
       recording: Expr[A],
       message: Expr[String],
       listener: Expr[RecorderListener[A, R]]): Expr[R] = {
-    val termArg: Term = recording.asTerm.underlyingArgument
+    val termArg: Term = recording.asTerm.underlyingArgument // TODO remove use of underlyingArgument
 
     '{
       val recorderRuntime: RecorderRuntime[A, R] = new RecorderRuntime($listener)
@@ -46,8 +46,8 @@ class RecorderMacro(using qctx0: Quotes) {
       found: Expr[A],
       message: Expr[String],
       listener: Expr[RecorderListener[A, R]]): Expr[R] = {
-    val expectedArg: Term = expected.asTerm.underlyingArgument
-    val foundArg: Term = found.asTerm.underlyingArgument
+    val expectedArg: Term = expected.asTerm
+    val foundArg: Term = found.asTerm
 
     '{
       val recorderRuntime: RecorderRuntime[A, R] = new RecorderRuntime($listener)
@@ -97,13 +97,15 @@ class RecorderMacro(using qctx0: Quotes) {
   }
 
   private[this] def recordAllValues(runtime: Term, expr: Term): Term =
+    // TODO use an TreeMap or an ExprMap
     expr match {
       case New(_)     => expr
       case Literal(_) => expr
       case Typed(r @ Repeated(xs, y), tpe) => Typed.copy(r)(recordSubValues(runtime, r), tpe)
       // don't record value of implicit "this" added by compiler; couldn't find a better way to detect implicit "this" than via point
       case Select(x@This(_), y) if expr.pos.start == x.pos.start => expr
       // case x: Select if x.symbol.isModule => expr // don't try to record the value of packages
+      case Inlined(call, Nil, t) => Inlined.copy(expr)(call, Nil, recordAllValues(runtime, t))
       case _ => recordValue(runtime, recordSubValues(runtime, expr), expr)
     }