[FIR, IR] Commonize isFakeOverride check for AbstractExpectActualAnnotationMatchChecker
This commit fixes fakeOverrides.fir.kt test that got broken in the previous commit Previously isFakeOverride was only checked on IR backend. Now this check is moved to AbstractExpectActualAnnotationMatchChecker which is used by both: frontend and backend. That's why frontend no longer reports false positive ACTUAL_ANNOTATIONS_NOT_MATCH_EXPECT Review: https://jetbrains.team/p/kt/reviews/13094/timeline
This commit is contained in:
+7
-2
@@ -19,6 +19,7 @@ import org.jetbrains.kotlin.fir.declarations.utils.isActual
|
||||
import org.jetbrains.kotlin.fir.expectActualMatchingContextFactory
|
||||
import org.jetbrains.kotlin.fir.expressions.FirAnnotation
|
||||
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
|
||||
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
|
||||
import org.jetbrains.kotlin.resolve.calls.mpp.AbstractExpectActualAnnotationMatchChecker
|
||||
|
||||
/**
|
||||
@@ -33,19 +34,23 @@ internal object FirActualAnnotationsMatchExpectChecker : FirBasicDeclarationChec
|
||||
|
||||
val actualSymbol = declaration.symbol
|
||||
val expectSymbol = actualSymbol.getSingleMatchedExpectForActualOrNull() ?: return
|
||||
checkAnnotationsMatch(expectSymbol, actualSymbol, context, reporter)
|
||||
|
||||
val actualContainingClass = context.containingDeclarations.lastOrNull()?.symbol as? FirRegularClassSymbol
|
||||
val expectContainingClass = actualContainingClass?.getSingleMatchedExpectForActualOrNull() as? FirRegularClassSymbol
|
||||
checkAnnotationsMatch(expectSymbol, actualSymbol, expectContainingClass, context, reporter)
|
||||
}
|
||||
|
||||
@OptIn(InternalDiagnosticFactoryMethod::class)
|
||||
private fun checkAnnotationsMatch(
|
||||
expectSymbol: FirBasedSymbol<*>,
|
||||
actualSymbol: FirBasedSymbol<*>,
|
||||
expectContainingClass: FirRegularClassSymbol?,
|
||||
context: CheckerContext,
|
||||
reporter: DiagnosticReporter,
|
||||
) {
|
||||
val matchingContext = context.session.expectActualMatchingContextFactory.create(context.session, context.scopeSession)
|
||||
val incompatibility =
|
||||
AbstractExpectActualAnnotationMatchChecker.areAnnotationsCompatible(expectSymbol, actualSymbol, matchingContext) ?: return
|
||||
AbstractExpectActualAnnotationMatchChecker.areAnnotationsCompatible(expectSymbol, actualSymbol, expectContainingClass, matchingContext) ?: return
|
||||
val actualAnnotationTargetSourceElement = (incompatibility.actualAnnotationTargetElement as FirSourceElement).element
|
||||
|
||||
reporter.report(
|
||||
|
||||
+6
-6
@@ -128,13 +128,13 @@ object FirExpectActualDeclarationChecker : FirBasicDeclarationChecker() {
|
||||
val matchingCompatibilityToMembersMap = symbol.expectForActual ?: return
|
||||
val expectedSingleCandidate =
|
||||
matchingCompatibilityToMembersMap[ExpectActualMatchingCompatibility.MatchedSuccessfully]?.singleOrNull()
|
||||
val expectActualMatchingContext = context.session.expectActualMatchingContextFactory.create(
|
||||
context.session, context.scopeSession,
|
||||
allowedWritingMemberExpectForActualMapping = true,
|
||||
)
|
||||
val actualContainingClass = context.containingDeclarations.lastOrNull()?.symbol as? FirRegularClassSymbol
|
||||
val expectContainingClass = actualContainingClass?.getSingleMatchedExpectForActualOrNull() as? FirRegularClassSymbol
|
||||
val checkingCompatibility = if (expectedSingleCandidate != null) {
|
||||
val expectActualMatchingContext = context.session.expectActualMatchingContextFactory.create(
|
||||
context.session, context.scopeSession,
|
||||
allowedWritingMemberExpectForActualMapping = true,
|
||||
)
|
||||
val actualContainingClass = context.containingDeclarations.lastOrNull()?.symbol as? FirRegularClassSymbol
|
||||
val expectContainingClass = actualContainingClass?.getSingleMatchedExpectForActualOrNull() as? FirRegularClassSymbol
|
||||
getCheckingCompatibility(
|
||||
symbol,
|
||||
expectedSingleCandidate,
|
||||
|
||||
+5
-4
@@ -363,15 +363,16 @@ class FirExpectActualMatchingContextImpl private constructor(
|
||||
return !isSam
|
||||
}
|
||||
|
||||
override fun CallableSymbolMarker.shouldSkipMatching(containingExpectClass: RegularClassSymbolMarker): Boolean {
|
||||
override fun CallableSymbolMarker.isFakeOverride(containingExpectClass: RegularClassSymbolMarker?): Boolean {
|
||||
if (containingExpectClass == null) {
|
||||
return false
|
||||
}
|
||||
val symbol = asSymbol()
|
||||
val classSymbol = containingExpectClass.asSymbol()
|
||||
if (symbol !is FirConstructorSymbol && symbol.dispatchReceiverType?.classId != classSymbol.classId) {
|
||||
// Skip fake overrides
|
||||
return true
|
||||
}
|
||||
return symbol.isSubstitutionOrIntersectionOverride // Skip fake overrides
|
||||
|| !symbol.isExpect // Skip non-expect declarations like equals, hashCode, toString and any inherited declarations from non-expect super types
|
||||
return symbol.isSubstitutionOrIntersectionOverride
|
||||
}
|
||||
|
||||
override val CallableSymbolMarker.hasStableParameterNames: Boolean
|
||||
|
||||
Reference in New Issue
Block a user