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

[FE] Refactoring: Move check for "enumConstructorsAreAlwaysCompatible" higher than check for callable kind

Browse Source 
Review: https://jetbrains.team/p/kt/reviews/11039/timeline

This is a preparation refactoring for the following KT-60902 fix and
type-safety refactoring.

This commit doesn't have observable side effects (and can be called pure refactoring) because the following conditions:
1. `expectDeclaration is ConstructorSymbolMarker && actualDeclaration is ConstructorSymbolMarker`
2. `expectDeclaration is FunctionSymbolMarker != actualDeclaration is FunctionSymbolMarker`

can't be both `true` at the same time
This commit is contained in:
Nikita Bobko
2023-08-02 18:59:54 +02:00
committed by teamcity
parent 529a1dd720
commit fd5e97ff23
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common/src/org/jetbrains/kotlin/resolve/calls/mpp/AbstractExpectActualCompatibilityChecker.kt
+4 -4
View File
@@ -288,10 +288,6 @@ object AbstractExpectActualCompatibilityChecker {
"This function should be invoked only for declarations in the same kind of container (both members or both top level): $expectDeclaration, $actualDeclaration" "This function should be invoked only for declarations in the same kind of container (both members or both top level): $expectDeclaration, $actualDeclaration"
} }
if (expectDeclaration is FunctionSymbolMarker != actualDeclaration is FunctionSymbolMarker) {
return Incompatible.CallableKind
}
if ( if (
enumConstructorsAreAlwaysCompatible && enumConstructorsAreAlwaysCompatible &&
expectContainingClass?.classKind == ClassKind.ENUM_CLASS && expectContainingClass?.classKind == ClassKind.ENUM_CLASS &&
@@ -302,6 +298,10 @@ object AbstractExpectActualCompatibilityChecker {
return ExpectActualCompatibility.Compatible return ExpectActualCompatibility.Compatible
} }
if (expectDeclaration is FunctionSymbolMarker != actualDeclaration is FunctionSymbolMarker) {
return Incompatible.CallableKind
}
val expectedReceiverType = expectDeclaration.extensionReceiverType val expectedReceiverType = expectDeclaration.extensionReceiverType
val actualReceiverType = actualDeclaration.extensionReceiverType val actualReceiverType = actualDeclaration.extensionReceiverType
if ((expectedReceiverType != null) != (actualReceiverType != null)) { if ((expectedReceiverType != null) != (actualReceiverType != null)) {