From acf48a1af7852aaeaa9c3afe8c1d5e62f44a3c17 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 12 Dec 2019 17:26:35 +0300
Subject: [PATCH] Return NONE from FirSuperTypeScope if nothing is found

---
 .../org/jetbrains/kotlin/fir/scopes/impl/FirSuperTypeScope.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSuperTypeScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSuperTypeScope.kt
index af2f6e2c241..7ded50988bc 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSuperTypeScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirSuperTypeScope.kt
@@ -59,7 +59,7 @@ class FirSuperTypeScope private constructor(
         processCallables: FirScope.(Name, (D) -> ProcessorAction) -> ProcessorAction
     ): ProcessorAction? {
         if (name in absentNames) {
-            return ProcessorAction.NEXT
+            return ProcessorAction.NONE
         }
 
         val membersByScope = scopes.mapNotNull { scope ->
@@ -76,7 +76,7 @@ class FirSuperTypeScope private constructor(
 
         if (membersByScope.isEmpty()) {
             absentNames.add(name)
-            return null
+            return ProcessorAction.NONE
         }
 
         membersByScope.singleOrNull()?.let { members ->