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

[FIR] Deduplicate isFakeOverride

Browse Source 
Reuse isFakeOverride from ExpectActualMatchingContext. It does the same
thing

Review: https://jetbrains.team/p/kt/reviews/13094/timeline
This commit is contained in:
Nikita Bobko
2023-11-16 19:11:50 +01:00
committed by teamcity
parent 5b72c127bd
commit c8a9928624
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDefaultArgumentsInExpectActualizedByFakeOverrideChecker.kt
+1 -9
View File
@@ -61,21 +61,13 @@ internal object FirDefaultArgumentsInExpectActualizedByFakeOverrideChecker : Fir
): List<FirNamedFunctionSymbol> { ): List<FirNamedFunctionSymbol> {
val actualFakeOverrideMembers = actualClassSymbol.collectAllMembers(isActualDeclaration = true) val actualFakeOverrideMembers = actualClassSymbol.collectAllMembers(isActualDeclaration = true)
.filterIsInstance<FirNamedFunctionSymbol>() .filterIsInstance<FirNamedFunctionSymbol>()
.filter { isFakeOverride(it, actualClassSymbol) } .filter { it.isFakeOverride(actualClassSymbol) || it.isDelegated }
return actualFakeOverrideMembers return actualFakeOverrideMembers
.mapNotNull { getSingleMatchingExpect(it, expectClassSymbol, actualClassSymbol) } .mapNotNull { getSingleMatchingExpect(it, expectClassSymbol, actualClassSymbol) }
.filter(::hasDefaultArgumentValues) .filter(::hasDefaultArgumentValues)
} }
private fun isFakeOverride(member: FirNamedFunctionSymbol, containingClassSymbol: FirRegularClassSymbol): Boolean {
val memberReceiverClassId = member.dispatchReceiverType?.classId ?: return false
if (memberReceiverClassId != containingClassSymbol.classId) {
return true
}
return member.isSubstitutionOrIntersectionOverride || member.isDelegated
}
private fun FirExpectActualMatchingContext.getSingleMatchingExpect( private fun FirExpectActualMatchingContext.getSingleMatchingExpect(
actualMember: FirNamedFunctionSymbol, actualMember: FirNamedFunctionSymbol,
expectSymbol: FirRegularClassSymbol, expectSymbol: FirRegularClassSymbol,