From dc689952cb8ee11aaaa87fb7a62a6e5951eb40ea Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Wed, 13 Sep 2023 21:02:37 +0200 Subject: [PATCH] [AA] Fix `isDeclared` for static callables in Java declared member scope - Static callables don't have a `dispatchReceiverType`, but certainly a `CallableId`. ^KT-61800 --- .../fir/scopes/JavaClassDeclaredMembersEnhancementScope.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/JavaClassDeclaredMembersEnhancementScope.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/JavaClassDeclaredMembersEnhancementScope.kt index 5344f40207e..862817768e0 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/JavaClassDeclaredMembersEnhancementScope.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/JavaClassDeclaredMembersEnhancementScope.kt @@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.scopes.impl.nestedClassifierScope import org.jetbrains.kotlin.fir.symbols.impl.* -import org.jetbrains.kotlin.fir.types.ConeLookupTagBasedType import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.SpecialNames @@ -23,9 +22,9 @@ internal class JavaClassDeclaredMembersEnhancementScope( private val useSiteMemberEnhancementScope: FirContainingNamesAwareScope ) : FirContainingNamesAwareScope() { private fun FirCallableDeclaration.isDeclared(): Boolean { - return (this.dispatchReceiverType as? ConeLookupTagBasedType)?.lookupTag == owner.symbol.toLookupTag() - && this.origin !is FirDeclarationOrigin.SubstitutionOverride - && this.origin != FirDeclarationOrigin.IntersectionOverride + return symbol.callableId.classId == owner.classId + && origin !is FirDeclarationOrigin.SubstitutionOverride + && origin != FirDeclarationOrigin.IntersectionOverride } private val callableNames = run {