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

[FIR] Cleanup ACTUAL_MISSING reporting

Browse Source 
The cleanup became possible after KT-62590
Review: https://jetbrains.team/p/kt/reviews/12750/timeline

`matchingCompatibilityToMembersMap.allMismatches()` is equivalent to
`ExpectActualMatchingCompatibility.MatchedSuccessfully !in
matchingCompatibilityToMembersMap`
This commit is contained in:
Nikita Bobko
2023-10-30 14:07:41 +01:00
committed by teamcity
parent 5be8778b44
commit 8f9b6a08fc
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExpectActualDeclarationChecker.kt
+3 -11
View File
@@ -145,14 +145,10 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker() {
val source = declaration.source val source = declaration.source
if (!declaration.isActual) { if (!declaration.isActual) {
if (matchingCompatibilityToMembersMap.allMismatches()) return if (checkActual && ExpectActualMatchingCompatibility.MatchedSuccessfully in matchingCompatibilityToMembersMap) {
reporter.reportOn(source, FirErrors.ACTUAL_MISSING, context)
if (ExpectActualMatchingCompatibility.MatchedSuccessfully in matchingCompatibilityToMembersMap) {
if (checkActual) {
reporter.reportOn(source, FirErrors.ACTUAL_MISSING, context)
}
return
} }
return
} }
when { when {
@@ -297,10 +293,6 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker() {
) )
} }
fun Map<out ExpectActualCompatibility<*>, *>.allMismatches(): Boolean {
return keys.all { it is ExpectActualMatchingCompatibility.Mismatch }
}
// we don't require `actual` modifier on // we don't require `actual` modifier on
// - annotation constructors, because annotation classes can only have one constructor // - annotation constructors, because annotation classes can only have one constructor
// - value class primary constructors, because value class must have primary constructor // - value class primary constructors, because value class must have primary constructor