@@ -427,21 +427,25 @@ object ProtoTypes {
427
427
* - t2 is a ascription (t22: T) and t1 is at the outside of t22
428
428
* - t2 is a closure (...) => t22 and t1 is at the outside of t22
429
429
*/
430
- def hasInnerErrors (t : Tree )(using Context ): Boolean = t match
431
- case Typed (expr, tpe) => hasInnerErrors(expr)
432
- case closureDef(mdef) => hasInnerErrors(mdef.rhs)
430
+ def hasInnerErrors (t : Tree , argType : Option [ Type ] )(using Context ): Boolean = t match
431
+ case Typed (expr, tpe) => hasInnerErrors(expr, argType )
432
+ case closureDef(mdef) => hasInnerErrors(mdef.rhs, argType )
433
433
case _ =>
434
434
t.existsSubTree { t1 =>
435
435
if t1.typeOpt.isError
436
436
&& t.span.toSynthetic != t1.span.toSynthetic
437
437
&& t.typeOpt != t1.typeOpt then
438
438
typr.println(i " error subtree $t1 of $t with ${t1.typeOpt}, spans = ${t1.span}, ${t.span}" )
439
- true
439
+ t1.typeOpt match
440
+ case errorType : ErrorType if errorType.msg.isInstanceOf [TypeMismatchMsg ] =>
441
+ val typeMismtachMsg = errorType.msg.asInstanceOf [TypeMismatchMsg ]
442
+ ! argType.contains(typeMismtachMsg.expected)
443
+ case _ => true
440
444
else
441
445
false
442
446
}
443
447
444
- private def cacheTypedArg (arg : untpd.Tree , typerFn : untpd.Tree => Tree , force : Boolean )(using Context ): Tree = {
448
+ private def cacheTypedArg (arg : untpd.Tree , typerFn : untpd.Tree => Tree , force : Boolean , argType : Option [ Type ] )(using Context ): Tree = {
445
449
var targ = state.typedArg(arg)
446
450
if (targ == null )
447
451
untpd.functionWithUnknownParamType(arg) match {
@@ -459,7 +463,7 @@ object ProtoTypes {
459
463
targ = typerFn(arg)
460
464
// TODO: investigate why flow typing is not working on `targ`
461
465
if ctx.reporter.hasUnreportedErrors then
462
- if hasInnerErrors(targ.nn) then
466
+ if hasInnerErrors(targ.nn, argType ) then
463
467
state.errorArgs += arg
464
468
else
465
469
state.typedArg = state.typedArg.updated(arg, targ.nn)
@@ -487,7 +491,7 @@ object ProtoTypes {
487
491
val protoTyperState = ctx.typerState
488
492
val oldConstraint = protoTyperState.constraint
489
493
val args1 = args.mapWithIndexConserve((arg, idx) =>
490
- cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false ))
494
+ cacheTypedArg(arg, arg => typer.typed(norm(arg, idx)), force = false , None ))
491
495
val newConstraint = protoTyperState.constraint
492
496
493
497
if ! args1.exists(arg => isUndefined(arg.tpe)) then state.typedArgs = args1
@@ -534,7 +538,8 @@ object ProtoTypes {
534
538
val locked = ctx.typerState.ownedVars
535
539
val targ = cacheTypedArg(arg,
536
540
typer.typedUnadapted(_, wideFormal, locked)(using argCtx),
537
- force = true )
541
+ force = true ,
542
+ Some (wideFormal))
538
543
val targ1 = typer.adapt(targ, wideFormal, locked)
539
544
if wideFormal eq formal then targ1
540
545
else checkNoWildcardCaptureForCBN(targ1)
0 commit comments