Fix a bug where method call with methods from outer scope get adapted

Author: zeptometer

compiler/src/scala/quoted/runtime/impl/QuoteMatcher.scala

@@ -528,14 +528,15 @@ object QuoteMatcher {
                  * * [x] cover the case of nested method call
                  * * [ ] contextual params?
                  * * [ ] erasure types?
-                 * * [ ] eta-expand only HOAS param methods
+                 * * [x] eta-expand only HOAS param methods
                  */
                 case Apply(methId: Ident, args) =>
-                  val fnId = env.get(tree.symbol).flatMap(argsMap.get).getOrElse(tree)
-                  ctx.typer.typed(
-                    untpd.Apply(
-                      untpd.Select(untpd.TypedSplice(fnId), nme.apply),
-                      args.map(untpd.TypedSplice(_))))
+                  env.get(tree.symbol).flatMap(argsMap.get)
+                    .map(fnId => ctx.typer.typed(
+                      untpd.Apply(
+                        untpd.Select(untpd.TypedSplice(fnId), nme.apply),
+                        args.map(untpd.TypedSplice(_)))))
+                    .getOrElse(super.transform(tree))
                 case Apply(fun, args) =>
                   val tfun = transform(fun)
                   val targs = transform(args)

tests/run-macros/i17105.check

@@ -1,2 +1,3 @@
-case single: (1st case 1st) outside
-case curried: (2nd case 1st, 2nd) outside
+case single: [1st case] arg1 outside
+case curried: [2nd case] arg1, arg2 outside
+case methods from outer scope: [1st case] arg1 outer-method

tests/run-macros/i17105/Macro_1.scala

@@ -4,9 +4,9 @@ inline def testExpr(inline body: Any) = ${ testExprImpl('body) }
 def testExprImpl(body: Expr[Any])(using Quotes): Expr[String] =
   body match
     case '{ def g(y: String) = "placeholder" + y; $a(g): String } =>
-      '{ $a((z: String) => s"(1st case ${z})") }
+      '{ $a((z: String) => s"[1st case] ${z}") }
     case '{ def g(y: String)(z: String) = "placeholder" + y; $a(g): String } =>
-      '{ $a((z1: String) => (z2: String) =>  s"(2nd case ${z1}, ${z2})") }
+      '{ $a((z1: String) => (z2: String) =>  s"[2nd case] ${z1}, ${z2}") }
     case _ => Expr("not matched")
 
 // TODO issue-17105: Clean this up if not neccessary

tests/run-macros/i17105/Test_2.scala

@@ -1,5 +1,5 @@
 @main def Test: Unit =
-  println("case single: " + testExpr { def f(x: String) = "placeholder" + x; f("1st") + " outside" })
-  println("case curried: " + testExpr { def f(x: String)(y: String) = "placeholder" + x; f("1st")("2nd") + " outside" })
-  def outer() = "outside-method"
-  println("case methods from outer scope " + testExpr { def f(x: String) = "placeholder" + x; f("1st") + outer() })
+  println("case single: " + testExpr { def f(x: String) = "placeholder" + x; f("arg1") + " outside" })
+  println("case curried: " + testExpr { def f(x: String)(y: String) = "placeholder" + x; f("arg1")("arg2") + " outside" })
+  def outer() = " outer-method"
+  println("case methods from outer scope: " + testExpr { def f(x: String) = "placeholder" + x; f("arg1") + outer() })