Adapt macro tests to new by-name

Author: nicolasstucki

tests/neg-macros/i6976.check

@@ -2,8 +2,8 @@
 -- Error: tests/neg-macros/i6976/Test_2.scala:5:44 ---------------------------------------------------------------------
 5 |  def main(args: Array[String]): Unit = mcr { 2 } // error
   |                                        ^^^^^^^^^
-  |    Exception occurred while executing macro expansion.
-  |    scala.MatchError: Inlined(EmptyTree,List(),Literal(Constant(2))) (of class dotty.tools.dotc.ast.Trees$Inlined)
-  |    	at playground.macros$.mcrImpl(Macro_1.scala:10)
+  |         Exception occurred while executing macro expansion.
+  |         scala.MatchError: Inlined(EmptyTree,List(),Ident(x$proxy1)) (of class dotty.tools.dotc.ast.Trees$Inlined)
+  |         	at playground.macros$.mcrImpl(Macro_1.scala:10)
   |
   | This location contains code that was inlined from Test_2.scala:5

tests/run-macros/i5119.check

@@ -1,2 +1,2 @@
-Select(Typed(Apply(Select(New(TypeIdent("StringContextOps")), "<init>"), List(Apply(Select(Select(Select(Ident("_root_"), "scala"), "StringContext"), "apply"), List(Typed(Repeated(List(Literal(StringConstant("Hello World ")), Literal(StringConstant("!"))), Inferred()), Inferred()))))), TypeIdent("StringContextOps")), "inline$sc")
+Apply(Select(Select(Typed(Apply(Select(New(TypeIdent("StringContextOps")), "<init>"), List(Apply(Ident("<byname>"), List(Apply(Select(Select(Select(Ident("_root_"), "scala"), "StringContext"), "apply"), List(Typed(Repeated(List(Literal(StringConstant("Hello World ")), Literal(StringConstant("!"))), Inferred()), Inferred()))))))), TypeIdent("StringContextOps")), "inline$sc"), "apply"), Nil)
 Typed(Repeated(List(Literal(IntConstant(1))), Inferred()), Inferred())

tests/run-macros/tasty-extractors-1.check

@@ -115,6 +115,6 @@ TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 Inlined(None, Nil, Block(List(DefDef("f8", List(TermParamClause(List(ValDef("i", Annotated(Applied(Inferred(), List(TypeIdent("Int"))), Apply(Select(New(Inferred()), "<init>"), Nil)), None)))), TypeIdent("Int"), Some(Literal(IntConstant(9))))), Apply(Ident("f8"), List(Typed(Repeated(List(Literal(IntConstant(1)), Literal(IntConstant(2)), Literal(IntConstant(3))), Inferred()), Inferred())))))
 TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")
 
-Inlined(None, Nil, Block(List(DefDef("f9", List(TermParamClause(List(ValDef("i", ByName(TypeIdent("Int")), None)))), TypeIdent("Int"), Some(Ident("i")))), Literal(UnitConstant())))
+Inlined(None, Nil, Block(List(DefDef("f9", List(TermParamClause(List(ValDef("i", ByName(TypeIdent("Int")), None)))), TypeIdent("Int"), Some(Apply(Select(Ident("i"), "apply"), Nil)))), Literal(UnitConstant())))
 TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
 

tests/run-macros/tasty-interpolation-1/Macro.scala

@@ -57,6 +57,13 @@ abstract class MacroStringInterpolator[T] {
   protected def getStaticStringContext(strCtxExpr: Expr[StringContext])(using Quotes) : StringContext = {
     import quotes.reflect.*
     strCtxExpr.asTerm.underlyingArgument match {
+      case Apply(Select(Select(Typed(Apply(_, List(Apply(Ident("<byname>"), List(Apply(Select(Select(Select(Ident("_root_"), "scala"), "StringContext"), "apply"), List(Typed(Repeated(strCtxArgTrees, _), Inferred()))))))), _), _), _), Nil) =>
+        val strCtxArgs = strCtxArgTrees.map {
+          case Literal(StringConstant(str)) => str
+          case tree => throw new NotStaticlyKnownError("Expected statically known StringContext", tree.asExpr)
+        }
+        StringContext(strCtxArgs*)
+      // Old style by-name
       case Select(Typed(Apply(_, List(Apply(_, List(Typed(Repeated(strCtxArgTrees, _), Inferred()))))), _), _) =>
         val strCtxArgs = strCtxArgTrees.map {
           case Literal(StringConstant(str)) => str

tests/run-macros/xml-interpolation-2/XmlQuote_1.scala

@@ -39,7 +39,7 @@ object XmlQuote {
     val parts: List[String] = stripTyped(receiver.asTerm.underlying) match {
       case Apply(conv, List(ctx1)) if isSCOpsConversion(conv) =>
         ctx1 match {
-          case Apply(fun, List(Typed(Repeated(values, _), _))) if isStringContextApply(fun) =>
+          case Apply(Ident("<byname>"), List(Apply(fun, List(Typed(Repeated(values, _), _))))) if isStringContextApply(fun) =>
             values.iterator.map {
               case Literal(StringConstant(value)) => value
               case _ =>