From 889182629e1bc2d3690bcbce81f45829ac493890 Mon Sep 17 00:00:00 2001 From: Kirill Rakhman Date: Wed, 14 Feb 2024 15:41:53 +0100 Subject: [PATCH] [FIR] Simplify JavaOverridabilityRules.shouldApplyJavaChecker --- .../kotlin/fir/java/scopes/JavaOverridabilityRules.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverridabilityRules.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverridabilityRules.kt index 68b359f6cec..f96fba355f9 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverridabilityRules.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/scopes/JavaOverridabilityRules.kt @@ -40,12 +40,9 @@ class JavaOverridabilityRules(session: FirSession) : PlatformSpecificOverridabil } private fun shouldApplyJavaChecker(overrideCandidate: FirCallableDeclaration, baseDeclaration: FirCallableDeclaration): Boolean { - return when { - // One candidate with Java original is enough to apply Java checker, - // otherwise e.g. primitive type comparisons do not work - overrideCandidate.isOriginallyFromJava() || baseDeclaration.isOriginallyFromJava() -> true - else -> false - } + // One candidate with Java original is enough to apply Java checker, + // otherwise e.g. primitive type comparisons do not work. + return overrideCandidate.isOriginallyFromJava() || baseDeclaration.isOriginallyFromJava() } private fun FirCallableDeclaration.isOriginallyFromJava(): Boolean = unwrapFakeOverrides().origin == FirDeclarationOrigin.Enhancement