Propagate dependencies through implicit parameters #5601
Conversation
| // done for non-implicit parameter lists in Applications#matchArgs#addTyped. | ||
| val formals2 = | ||
| if (wtp.isParamDependent && arg.tpe.exists) | ||
| formals1 mapconserve {f1 => safeSubstParam(f1, wtp.paramRefs(n), arg.tpe)} |
There was a problem hiding this comment.
style nitpick:
| formals1 mapconserve {f1 => safeSubstParam(f1, wtp.paramRefs(n), arg.tpe)} | |
| formals1.mapconserve(f1 => safeSubstParam(f1, wtp.paramRefs(n), arg.tpe)) |
There was a problem hiding this comment.
I suggest pressing "Resolve conversation" below instead of saying "Done.", it reduces the number of emails we get :).
| // types through the remainder of the parameter list similarly to how it's | ||
| // done for non-implicit parameter lists in Applications#matchArgs#addTyped. | ||
| val formals2 = | ||
| if (wtp.isParamDependent && arg.tpe.exists) |
There was a problem hiding this comment.
I don't think arg.tpe.exists can occur here unlike addTyped, but we should check arg.tpe.isError since in case of implicit failure, the type will be an instance of SearchFailureType which is a subtype of ErrorType:
| if (wtp.isParamDependent && arg.tpe.exists) | |
| if (wtp.isParamDependent && !arg.tpe.isError) |
I also suggest adding some negative test cases that exercises this code path.
There was a problem hiding this comment.
We do need exists here. Switching to !arg.tpe.isError results in an assertion for a non-existent getter denotation.
I'll add some negative test cases.
| if (wtp.isParamDependent && arg.tpe.exists) | ||
| formals1 mapconserve {f1 => safeSubstParam(f1, wtp.paramRefs(n), arg.tpe)} | ||
| else formals1 | ||
| arg :: implicitArgs(formals2, n+1) |
There was a problem hiding this comment.
| arg :: implicitArgs(formals2, n+1) | |
| arg :: implicitArgs(formals2, n + 1) |
| @@ -2348,7 +2348,7 @@ class Typer extends Namer | |||
| def dummyArg(tp: Type) = untpd.Ident(nme.???).withTypeUnchecked(tp) | |||
|
|
|||
| def addImplicitArgs(implicit ctx: Context) = { | |||
| def implicitArgs(formals: List[Type]): List[Tree] = formals match { | |||
| def implicitArgs(formals: List[Type], n: Int): List[Tree] = formals match { | |||
There was a problem hiding this comment.
either give a more explicit name for this parameter or add some documentation for this method (something that would be nice to have anyway :))
There was a problem hiding this comment.
Renamed to argIndex.
|
@smarter incorporated your feedback. |
|
We prefix Dotty issues with |
|
@milessabin Now that github shows diffs when push-forcing commits, I prefer when commits are amended and push-forced to address the feedback of reviewers instead of making new commits just for that (it keeps the history tidy) |
|
Okey doke. I'll reprefix the tests to |
Fixes scala#5427. If an implicit parameter list is dependent, we must propagate inferred types through the remainder of the parameter list, similarly to how it's done for non-implicit parameter lists in Applications#matchArgs#addTyped.
milessabin
force-pushed
the
topic/t5427
branch
from
c598c53
to
ccba10c
Compare
|
@smarter do you want to do the honours? |
Fixes #5427.
If an implicit parameter list is dependent, we must propagate inferred types through the remainder of the parameter list, similarly to how it's done for non-implicit parameter lists in
Applications#matchArgs#addTyped.