Type addImplicitsArgs result with the first failure

scala · Apr 25, 2024 · 0890e7a · 0890e7a
1 parent fc06435
commit 0890e7a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -3902,7 +3902,8 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
               case _ => ()
 
         val args = implicitArgs(wtp.paramInfos, 0, pt)
-        if (args.tpes.exists(_.isInstanceOf[SearchFailureType])) {
+        val firstFailure = args.tpes.find(_.isInstanceOf[SearchFailureType])
+        if (firstFailure.isDefined) {
           // If there are several arguments, some arguments might already
           // have influenced the context, binding variables, but later ones
           // might fail. In that case the constraint and instantiated variables
@@ -3938,10 +3939,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
             retyped
           else
-            val firstNonAmbiguous = args.tpes.find(tp => tp.isError && !tp.isInstanceOf[AmbiguousImplicits])
-            def firstError = args.tpes.find(_.isError)
-            val errorType = firstNonAmbiguous.orElse(firstError).getOrElse(NoType)
-            val res = untpd.Apply(tree, args).withType(errorType)
+            val res = untpd.Apply(tree, args).withType(firstFailure.get)
             reportErrors(res, wtp)
             res
         }