From b701c1c6f6b383a903f893635160187ed4b963e9 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sat, 23 Jul 2022 15:51:58 +0200 Subject: [PATCH] [LL FIR] fix top-level callables classpath conflicts checks for single-file facades --- .../providers/LLFirModuleWithDependenciesSymbolProvider.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirModuleWithDependenciesSymbolProvider.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirModuleWithDependenciesSymbolProvider.kt index 9ad7de69fa6..a764d50a369 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirModuleWithDependenciesSymbolProvider.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirModuleWithDependenciesSymbolProvider.kt @@ -173,8 +173,10 @@ internal abstract class LLFirDependentModuleProviders( facades += newFacades } - private fun FirCallableSymbol<*>.jvmClassName(): JvmClassName? = - (fir.containerSource as? JvmPackagePartSource)?.facadeClassName + private fun FirCallableSymbol<*>.jvmClassName(): JvmClassName? { + val jvmPackagePartSource = fir.containerSource as? JvmPackagePartSource ?: return null + return jvmPackagePartSource.facadeClassName ?: jvmPackagePartSource.className + } }