From fb22a319769fbe61e2670a7052dd733ba38b60bc Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 16 Oct 2019 16:11:17 +0300 Subject: [PATCH] JavaClassUseSiteScope is made not-provider based Before this commit, Java use-site scope was provider based for some reason. In fact, provider was not used in this scope anyway, so this can be safely removed --- .../kotlin/fir/java/scopes/JavaClassUseSiteScope.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt index b87413adeb7..591ab9b3030 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaClassUseSiteScope.kt @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.fir.resolve.substitution.substitutorByMap import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.ProcessorAction import org.jetbrains.kotlin.fir.scopes.ProcessorAction.* -import org.jetbrains.kotlin.fir.scopes.impl.FirAbstractProviderBasedScope import org.jetbrains.kotlin.fir.scopes.impl.FirSuperTypeScope import org.jetbrains.kotlin.fir.symbols.* import org.jetbrains.kotlin.fir.symbols.impl.* @@ -27,10 +26,10 @@ import org.jetbrains.kotlin.name.Name class JavaClassUseSiteScope( klass: FirRegularClass, - session: FirSession, + private val session: FirSession, private val superTypesScope: FirSuperTypeScope, private val declaredMemberScope: FirScope -) : FirAbstractProviderBasedScope(session, lookupInFir = true) { +) : FirScope() { internal val symbol = klass.symbol private val javaTypeParameterStack: JavaTypeParameterStack =