azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[AA] Fix isDeclared for static callables in Java declared member scope

Browse Source 
- Static callables don't have a `dispatchReceiverType`, but certainly a
  `CallableId`.

^KT-61800
This commit is contained in:
Marco Pennekamp
2023-09-13 21:02:37 +02:00
committed by Space Team
parent e5bfcfc9fc
commit dc689952cb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/JavaClassDeclaredMembersEnhancementScope.kt
+3 -4
View File
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.scopes.* import org.jetbrains.kotlin.fir.scopes.*
import org.jetbrains.kotlin.fir.scopes.impl.nestedClassifierScope import org.jetbrains.kotlin.fir.scopes.impl.nestedClassifierScope
import org.jetbrains.kotlin.fir.symbols.impl.* 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.Name
import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.name.SpecialNames
@@ -23,9 +22,9 @@ internal class JavaClassDeclaredMembersEnhancementScope(
private val useSiteMemberEnhancementScope: FirContainingNamesAwareScope private val useSiteMemberEnhancementScope: FirContainingNamesAwareScope
) : FirContainingNamesAwareScope() { ) : FirContainingNamesAwareScope() {
private fun FirCallableDeclaration.isDeclared(): Boolean { private fun FirCallableDeclaration.isDeclared(): Boolean {
return (this.dispatchReceiverType as? ConeLookupTagBasedType)?.lookupTag == owner.symbol.toLookupTag() return symbol.callableId.classId == owner.classId
&& this.origin !is FirDeclarationOrigin.SubstitutionOverride && origin !is FirDeclarationOrigin.SubstitutionOverride
&& this.origin != FirDeclarationOrigin.IntersectionOverride && origin != FirDeclarationOrigin.IntersectionOverride
} }
private val callableNames = run { private val callableNames = run {