diff options
| -rw-r--r-- | src/dotty/tools/dotc/typer/Implicits.scala | 17 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/typer/Implicits.scala b/src/dotty/tools/dotc/typer/Implicits.scala index c236f8335..0c2606d89 100644 --- a/src/dotty/tools/dotc/typer/Implicits.scala +++ b/src/dotty/tools/dotc/typer/Implicits.scala @@ -294,6 +294,12 @@ trait Implicits { self: Typer => /** The expected type for the searched implicit */ lazy val fullProto = implicitProto(pt) + lazy val funProto = fullProto match { + case proto: ViewProto => + FunProto(dummyTreeOfType(proto.argType) :: Nil, proto.resultType, self) + case proto => proto + } + /** The expected type where parameters and uninstantiated typevars are replaced by wildcard types */ val wildProto = implicitProto((new WildApprox) apply pt) @@ -315,10 +321,13 @@ trait Implicits { self: Typer => pt) val generated1 = adapt(generated, pt) lazy val shadowing = - typed(untpd.Ident(ref.name) withPos pos.toSynthetic, fullProto)(nestedContext.withNewTyperState).tpe - if (ctx.typerState.reporter.hasErrors) nonMatchingImplicit(ref) - else if (contextual && !(shadowing =:= ref)) shadowedImplicit(ref, shadowing) - else SearchSuccess(generated, ref, ctx.typerState) + typed(untpd.Ident(ref.name) withPos pos.toSynthetic, funProto)(nestedContext.withNewTyperState) + if (ctx.typerState.reporter.hasErrors) + nonMatchingImplicit(ref) + else if (contextual && shadowing.symbol != ref.symbol) + shadowedImplicit(ref, methPart(shadowing).tpe) + else + SearchSuccess(generated, ref, ctx.typerState) }} /** Given a list of implicit references, produce a list of all implicit search successes, diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 7493fb42d..cf7d54ca6 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -1113,8 +1113,8 @@ class Typer extends Namer with Applications with Implicits { } // try an implicit conversion inferView(tree, pt) match { - case SearchSuccess(adapted, _, _) => - adapted + case SearchSuccess(inferred, _, _) => + adapt(inferred, pt) case failure: SearchFailure => if (pt.isInstanceOf[ProtoType]) tree else err.typeMismatch(tree, pt, failure) |