SAM conversion precedes implicit view application (as in dotty).

This reflects the majority vote on the PR.

DSLs that need their implicit conversions to kick in instead of
SAM conversion, will have to make their target types not be SAM
types (e.g., by adding a second abstract method to them).

1 files changed, 8 insertions, 8 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index a9d5b69e2e..52242c10b3 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -1053,6 +1053,14 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
           if (hasUndets)
             return instantiate(tree, mode, pt)
 
+          // we know `!(tree.tpe <:< pt)`; try to remedy if there's a sam for pt
+          val sam = samMatchingFunction(tree, pt) // this implies tree.isInstanceOf[Function]
+          if (sam.exists && !tree.tpe.isErroneous) {
+            val samTree = adaptToSAM(sam, tree.asInstanceOf[Function], pt, mode)
+            if (samTree ne EmptyTree)
+              return samTree.updateAttachment(SAMFunction(pt, sam))
+          }
+
           if (context.implicitsEnabled && !pt.isError && !tree.isErrorTyped) {
             // (14); the condition prevents chains of views
             inferView(tree, tree.tpe, pt) match {
@@ -1071,14 +1079,6 @@ trait Typers extends Adaptations with Tags with TypersTracking with PatternTyper
                 }
             }
           }
-
-          // we know `!(tree.tpe <:< pt)`; try to remedy if there's a sam for pt
-          val sam = samMatchingFunction(tree, pt) // this implies tree.isInstanceOf[Function]
-          if (sam.exists && !tree.tpe.isErroneous) {
-            val samTree = adaptToSAM(sam, tree.asInstanceOf[Function], pt, mode)
-            if (samTree ne EmptyTree)
-              return samTree.updateAttachment(SAMFunction(pt, sam))
-          }
         }
 
         debuglog("error tree = " + tree)