From 52a1ffb312d4b3a2b1368be91faa8bff46327785 Mon Sep 17 00:00:00 2001 From: Jinseong Jeon Date: Mon, 4 Dec 2023 13:50:30 -0800 Subject: [PATCH] AA: better way to filter out non-JVM modules --- .../components/KtFe10SymbolContainingDeclarationProvider.kt | 6 +++--- .../components/KtFirSymbolContainingDeclarationProvider.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt index 987dd494051..c8e09a61462 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment import org.jetbrains.kotlin.load.kotlin.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.TargetPlatform -import org.jetbrains.kotlin.platform.isCommon -import org.jetbrains.kotlin.platform.jvm.isJvm +import org.jetbrains.kotlin.platform.has +import org.jetbrains.kotlin.platform.jvm.JvmPlatform import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices @@ -95,7 +95,7 @@ internal class KtFe10SymbolContainingDeclarationProvider( override fun getContainingJvmClassName(symbol: KtCallableSymbol): String? { val platform = getContainingModule(symbol).platform - if (!platform.isCommon() && !platform.isJvm()) return null + if (!platform.has()) return null val containingSymbolOrSelf = symbol.containingSymbolOrSelf as KtSymbolWithKind return when (val descriptor = containingSymbolOrSelf.getDescriptor()) { diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt index 5fc5131721b..15aff2f2125 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolContainingDeclarationProvider.kt @@ -34,8 +34,8 @@ import org.jetbrains.kotlin.fir.psi import org.jetbrains.kotlin.fir.resolve.providers.firProvider import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.platform.isCommon -import org.jetbrains.kotlin.platform.jvm.isJvm +import org.jetbrains.kotlin.platform.has +import org.jetbrains.kotlin.platform.jvm.JvmPlatform import org.jetbrains.kotlin.psi import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment @@ -123,7 +123,7 @@ internal class KtFirSymbolContainingDeclarationProvider( override fun getContainingJvmClassName(symbol: KtCallableSymbol): String? { val platform = getContainingModule(symbol).platform - if (!platform.isCommon() && !platform.isJvm()) return null + if (!platform.has()) return null val containingSymbolOrSelf = when (symbol) { is KtValueParameterSymbol -> {