FIR: Replace callableId for intersection overrides

2020-09-09 14:27:04 +03:00
parent 11bc0e3225
commit 0297be1fa8
3 changed files with 12 additions and 8 deletions
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.java.declarations.FirJavaClass
 import org.jetbrains.kotlin.fir.java.scopes.*
 import org.jetbrains.kotlin.fir.resolve.*
-import org.jetbrains.kotlin.fir.resolve.toSymbol
 import org.jetbrains.kotlin.fir.scopes.FirScope
 import org.jetbrains.kotlin.fir.scopes.FirScopeProvider
 import org.jetbrains.kotlin.fir.scopes.FirTypeScope
@@ -112,7 +111,8 @@ class JavaScopeProvider(
                        if (regularClass is FirJavaClass) regularClass.javaTypeParameterStack
                        else JavaTypeParameterStack.EMPTY
                    ),
-                    superTypeEnhancementScopes
+                    superTypeEnhancementScopes,
+                    regularClass.classId,
                ), wrappedDeclaredScope
            )
        }