Clean up control flow in level

odersky · odersky · commit ff9de666b481 · 2020-10-08T18:29:54.000+02:00
diff --git a/community-build/community-projects/scalatest b/community-build/community-projects/scalatest
@@ -1 +1 @@
-Subproject commit e447cc132f61444ec97e50d9937a85b10c0d76e2
+Subproject commit 70c08e1b63125b149ea5e6f5a34d8a0bb3b78b9f
diff --git a/community-build/community-projects/scodec b/community-build/community-projects/scodec
@@ -1 +1 @@
-Subproject commit e04ba7c17f848a57425a7e0342c00c0314c9559d
+Subproject commit 5de8baee379463996e9837e39a462ca8e1e33c45
diff --git a/community-build/community-projects/shapeless b/community-build/community-projects/shapeless
@@ -1 +1 @@
-Subproject commit 9f6cb180bdabc09886c2665ed17ed8bc1ea77afd
+Subproject commit b4c2d61ac785720c8ea33eda51104af15fb007d8
diff --git a/community-build/community-projects/xml-interpolator b/community-build/community-projects/xml-interpolator
@@ -1 +1 @@
-Subproject commit b744dff4553b7f7d9855bb9943a868fafc4db101
+Subproject commit 5b7836580ed0473bf6a91360a76e306a3e7b0b96
diff --git a/compiler/src/dotty/tools/dotc/typer/Implicits.scala b/compiler/src/dotty/tools/dotc/typer/Implicits.scala
@@ -306,14 +306,16 @@ object Implicits:
      *  Scala2 mode, since we do not want to change the implicit disambiguation then.
      */
     override val level: Int =
+      def isSameOwner = irefCtx.owner eq outerImplicits.irefCtx.owner
+      def isSameScope = irefCtx.scope eq outerImplicits.irefCtx.scope
+      def isLazyImplicit = refs.head.implicitName.is(LazyImplicitName)
+
       if outerImplicits == null then 1
-      else if isImport && (irefCtx.owner eq outerImplicits.irefCtx.owner)
-              || migrateTo3(using irefCtx)
-              || (irefCtx.owner eq outerImplicits.irefCtx.owner)
-                 && (irefCtx.scope eq outerImplicits.irefCtx.scope)
-                 && !refs.head.implicitName.is(LazyImplicitName)
+      else if migrateTo3(using irefCtx)
+              || isSameOwner && (isImport || isSameScope && !isLazyImplicit)
       then outerImplicits.level
       else outerImplicits.level + 1
+    end level
 
     /** Is this the outermost implicits? This is the case if it either the implicits
      *  of NoContext, or the last one before it.
