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

[FIR] Simplify JavaOverridabilityRules.shouldApplyJavaChecker

Browse Source
This commit is contained in:
Kirill Rakhman
2024-02-14 15:41:53 +01:00
committed by Space Team
parent d10b9c6506
commit 889182629e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverridabilityRules.kt
+3 -6
View File
@@ -40,12 +40,9 @@ class JavaOverridabilityRules(session: FirSession) : PlatformSpecificOverridabil
} }
private fun shouldApplyJavaChecker(overrideCandidate: FirCallableDeclaration, baseDeclaration: FirCallableDeclaration): Boolean { private fun shouldApplyJavaChecker(overrideCandidate: FirCallableDeclaration, baseDeclaration: FirCallableDeclaration): Boolean {
return when { // One candidate with Java original is enough to apply Java checker,
// One candidate with Java original is enough to apply Java checker, // otherwise e.g. primitive type comparisons do not work.
// otherwise e.g. primitive type comparisons do not work return overrideCandidate.isOriginallyFromJava() || baseDeclaration.isOriginallyFromJava()
overrideCandidate.isOriginallyFromJava() || baseDeclaration.isOriginallyFromJava() -> true
else -> false
}
} }
private fun FirCallableDeclaration.isOriginallyFromJava(): Boolean = unwrapFakeOverrides().origin == FirDeclarationOrigin.Enhancement private fun FirCallableDeclaration.isOriginallyFromJava(): Boolean = unwrapFakeOverrides().origin == FirDeclarationOrigin.Enhancement