Merge pull request #9300 from dotty-staging/fix-#9295

Fix #9295: Avoid recursive Dynamics conversion

Author: nicolasstucki

compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala

@@ -140,9 +140,19 @@ trait TypeAssigner {
     val name = tree.name
     val pre = maybeSkolemizePrefix(qualType, name)
     val mbr = qualType.findMember(name, pre)
+    def isDynamicExpansion(tree: untpd.RefTree): Boolean = {
+      Dynamic.isDynamicMethod(name) || (
+        tree match
+          case Select(Apply(fun: untpd.RefTree, _), nme.apply) if defn.isContextFunctionClass(fun.symbol.owner) =>
+            isDynamicExpansion(fun)
+          case  Select(qual, nme.apply) =>
+            Dynamic.isDynamicMethod(qual.symbol.name) && tree.span.isSynthetic
+          case _ => false
+      )
+    }
     if (reallyExists(mbr))
       qualType.select(name, mbr)
-    else if (qualType.derivesFrom(defn.DynamicClass) && name.isTermName && !Dynamic.isDynamicMethod(name))
+    else if (qualType.derivesFrom(defn.DynamicClass) && name.isTermName && !isDynamicExpansion(tree))
       TryDynamicCallType
     else if (qualType.isErroneous || name.toTermName == nme.ERROR)
       UnspecifiedErrorType

tests/neg/i9295a.scala

@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def applyDynamic(arg: Any): Foo = ???
+}
+object F {
+  val foo = new Foo
+  def baz = foo.blah(43) // error: method applyDynamic in class Foo does not take more parameters
+}

tests/neg/i9295b.scala

@@ -0,0 +1,14 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def applyDynamic(arg: Any): Bar = ???
+}
+class Bar extends Dynamic {
+  def applyDynamic(arg: Any)(x: Int): Int = ???
+}
+object F {
+  val foo = new Foo
+  def baz = foo.blah(43) // error: method applyDynamic in class Foo does not take more parameters
+  def qux = foo.blah.blah(43) // error: value selectDynamic is not a member of Foo
+  def quxx = foo.blah().blah(43) // error: method applyDynamic in class Foo does not take more parameters
+}

tests/neg/i9295c.scala

@@ -0,0 +1,12 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def selectDynamic(name: String)(using DummyImplicit): Bar = ???
+}
+
+class Bar extends Dynamic {
+  def applyDynamic(name: String)(x: Int) = ???
+}
+
+val foo = new Foo
+def baz = foo.blah(42) // error

tests/neg/i9295d.scala

@@ -0,0 +1,12 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def applyDynamic(name: String)(): DummyImplicit ?=> Bar = ???
+}
+
+class Bar extends Dynamic {
+  def applyDynamic(name: String)(x: Int) = ???
+}
+
+val foo = new Foo
+def baz = foo.blah()(42) // error

tests/pos/i9295.scala

@@ -0,0 +1,12 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def applyDynamic(name: String)(): Bar = ???
+}
+
+class Bar extends Dynamic {
+  def applyDynamic(name: String)(x: Int) = ???
+}
+
+val foo = new Foo
+def baz = foo.blah().apply(42)

tests/pos/i9295b.scala

@@ -0,0 +1,12 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def applyDynamic(name: String)()(using DummyImplicit): Bar = ???
+}
+
+class Bar extends Dynamic {
+  def applyDynamic(name: String)(x: Int) = ???
+}
+
+val foo = new Foo
+def baz = foo.blah().apply(42)

tests/pos/i9295c.scala

@@ -0,0 +1,12 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def selectDynamic(name: String)(using DummyImplicit): Bar = ???
+}
+
+class Bar extends Dynamic {
+  def applyDynamic(name: String)(x: Int) = ???
+}
+
+val foo = new Foo
+def baz = foo.blah.apply(42)

tests/pos/i9295d.scala

@@ -0,0 +1,12 @@
+import scala.language.dynamics
+
+class Foo extends Dynamic {
+  def applyDynamic(name: String)(): DummyImplicit ?=> DummyImplicit ?=> Bar = ???
+}
+
+class Bar extends Dynamic {
+  def applyDynamic(name: String)(x: Int) = ???
+}
+
+val foo = new Foo
+def baz = foo.blah().apply(42)