From 9902d36d57bb867e7b70a22cc514f661b9921f53 Mon Sep 17 00:00:00 2001 From: "Denis.Zharkov" Date: Tue, 14 Sep 2021 12:50:50 +0300 Subject: [PATCH] FIR: Minor. Rename --- .../org/jetbrains/kotlin/fir/java/JavaClassConverter.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaClassConverter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaClassConverter.kt index 74bb8093c6c..25afc6333b7 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaClassConverter.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaClassConverter.kt @@ -49,20 +49,20 @@ import org.jetbrains.kotlin.util.OperatorNameConventions class JavaClassConverter( private val session: FirSession, private val baseModuleData: FirModuleData, - private val facade: JavaClassFinder + private val classFinder: JavaClassFinder ) { companion object { val VALUE_METHOD_NAME = Name.identifier("value") } - private val packageCache = session.firCachesFactory.createCache(facade::findPackage) - private val knownClassNamesInPackage = session.firCachesFactory.createCache(facade::knownClassNamesInPackage) + private val packageCache = session.firCachesFactory.createCache(classFinder::findPackage) + private val knownClassNamesInPackage = session.firCachesFactory.createCache(classFinder::knownClassNamesInPackage) private val parentClassTypeParameterStackCache = mutableMapOf() private val parentClassEffectiveVisibilityCache = mutableMapOf() fun findClass(classId: ClassId, knownContent: ByteArray? = null): JavaClass? = - facade.findClass(JavaClassFinder.Request(classId, knownContent)) + classFinder.findClass(JavaClassFinder.Request(classId, knownContent)) ?.takeIf { it.classId == classId && !it.hasMetadataAnnotation() } fun getPackage(fqName: FqName): FqName? =