aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dotty/tools/dotc/typer/Typer.scala30
-rw-r--r--tests/pos/i576.scala18
2 files changed, 43 insertions, 5 deletions
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
index b886d8663..854bc2094 100644
--- a/src/dotty/tools/dotc/typer/Typer.scala
+++ b/src/dotty/tools/dotc/typer/Typer.scala
@@ -1437,10 +1437,15 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
wtp.paramTypes.foreach(instantiateSelected(_, tvarsToInstantiate))
val constr = ctx.typerState.constraint
def addImplicitArgs = {
- def implicitArgError(msg: => String): Tree = {
- ctx.error(msg, tree.pos.endPos)
+ val errors = new mutable.ListBuffer[() => String]
+ def implicitArgError(msg: => String) = {
+ errors += (() => msg)
EmptyTree
}
+ def issueErrors() = {
+ for (err <- errors) ctx.error(err(), tree.pos.endPos)
+ tree
+ }
val args = (wtp.paramNames, wtp.paramTypes).zipped map { (pname, formal) =>
def where = d"parameter $pname of $methodStr"
inferImplicit(formal, EmptyTree, tree.pos.endPos) match {
@@ -1452,12 +1457,27 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
implicitArgError(d"no implicit argument of type $formal found for $where" + failure.postscript)
}
}
- if (args.exists(_.isEmpty)) {
+ if (errors.nonEmpty) {
// If there are several arguments, some arguments might already
- // have influenced the context, binfing variables, but later ones
+ // have influenced the context, binding variables, but later ones
// might fail. In that case the constraint needs to be reset.
ctx.typerState.constraint = constr
- tree
+
+ // If method has default params, fall back to regular application
+ // where all inferred implicits are passed as named args.
+ if (tree.symbol.hasDefaultParams) {
+ val namedArgs = (wtp.paramNames, args).zipped.flatMap { (pname, arg) =>
+ arg match {
+ case EmptyTree => Nil
+ case _ => untpd.NamedArg(pname, untpd.TypedSplice(arg)) :: Nil
+ }
+ }
+ tryEither { implicit ctx =>
+ typed(untpd.Apply(untpd.TypedSplice(tree), namedArgs), pt)
+ } { (_, _) =>
+ issueErrors()
+ }
+ } else issueErrors()
}
else adapt(tpd.Apply(tree, args), pt)
}
diff --git a/tests/pos/i576.scala b/tests/pos/i576.scala
new file mode 100644
index 000000000..77b38d742
--- /dev/null
+++ b/tests/pos/i576.scala
@@ -0,0 +1,18 @@
+class A
+
+object Impl {
+ def foo()(implicit x: A = null): Int = 2
+ def test: Int = {
+ foo()() // ok
+ foo() // did not work before, does now
+ }
+}
+
+// same with multiple parameters
+object Impl2 {
+ def foo()(implicit ev: Int, x: A = null): Int = 2
+ def test: Int = {
+ implicit val ii: Int = 1
+ foo()
+ }
+}