[FIR] 2/2 Support more wider actual member visibility, if the expect member is effectively final

^KT-61955 Fixed

Introduce LV vs don't introduce LV:

introduce LV:
- K1 IDE and K2 project: IDE accurately shows compiler errors
- K2 IDE and K1 project: There are cases when IDE shows red but in reality it's green

don't introduce LV:
- K1 IDE and K2 project: There are cases when IDE shows red but in reality it's green
- K2 IDE and K1 project: There are cases when IDE shows green but in reality it's red
This commit is contained in:
Nikita Bobko
2023-09-14 20:26:14 +02:00
committed by Space Team
parent e13ebe8474
commit 7b8445f914
13 changed files with 246 additions and 3 deletions
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.resolve.calls.mpp
import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.config.LanguageVersionSettings
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
@@ -360,6 +361,7 @@ object AbstractExpectActualChecker {
if (!areCompatibleCallableVisibilities(
expectDeclaration.visibility,
expectModality,
expectContainingClass?.modality,
actualDeclaration.visibility,
languageVersionSettings
)
@@ -404,7 +406,7 @@ object AbstractExpectActualChecker {
getFunctionsIncompatibility(expectDeclaration, actualDeclaration)?.let { return it }
expectDeclaration is PropertySymbolMarker && actualDeclaration is PropertySymbolMarker ->
getPropertiesIncompatibility(expectDeclaration, actualDeclaration, languageVersionSettings)?.let { return it }
getPropertiesIncompatibility(expectDeclaration, actualDeclaration, expectContainingClass, languageVersionSettings)?.let { return it }
expectDeclaration is EnumEntrySymbolMarker && actualDeclaration is EnumEntrySymbolMarker -> {
// do nothing, entries are matched only by name
@@ -465,11 +467,17 @@ object AbstractExpectActualChecker {
private fun areCompatibleCallableVisibilities(
expectVisibility: Visibility,
expectModality: Modality?,
expectContainingClassModality: Modality?,
actualVisibility: Visibility,
languageVersionSettings: LanguageVersionSettings,
): Boolean {
val compare = Visibilities.compare(expectVisibility, actualVisibility)
return if (expectModality != Modality.FINAL) {
val effectiveModality =
when (languageVersionSettings.supportsFeature(LanguageFeature.SupportEffectivelyFinalInExpectActualVisibilityCheck)) {
true -> effectiveModality(expectModality, expectContainingClassModality)
false -> expectModality
}
return if (effectiveModality != Modality.FINAL) {
// For overridable declarations visibility should match precisely, see KT-19664
compare == 0
} else {
@@ -536,13 +544,14 @@ object AbstractExpectActualChecker {
private fun getPropertiesIncompatibility(
expected: PropertySymbolMarker,
actual: PropertySymbolMarker,
expectContainingClass: RegularClassSymbolMarker?,
languageVersionSettings: LanguageVersionSettings,
): ExpectActualCheckingCompatibility.Incompatible<*>? {
return when {
!equalBy(expected, actual) { p -> p.isVar } -> ExpectActualCheckingCompatibility.PropertyKind
!equalBy(expected, actual) { p -> p.isLateinit } -> ExpectActualCheckingCompatibility.PropertyLateinitModifier
expected.isConst && !actual.isConst -> ExpectActualCheckingCompatibility.PropertyConstModifier
!arePropertySettersWithCompatibleVisibilities(expected, actual, languageVersionSettings) ->
!arePropertySettersWithCompatibleVisibilities(expected, actual, expectContainingClass, languageVersionSettings) ->
ExpectActualCheckingCompatibility.PropertySetterVisibility
else -> null
}
@@ -552,6 +561,7 @@ object AbstractExpectActualChecker {
private fun arePropertySettersWithCompatibleVisibilities(
expected: PropertySymbolMarker,
actual: PropertySymbolMarker,
expectContainingClass: RegularClassSymbolMarker?,
languageVersionSettings: LanguageVersionSettings,
): Boolean {
val expectedSetter = expected.setter ?: return true
@@ -559,6 +569,7 @@ object AbstractExpectActualChecker {
return areCompatibleCallableVisibilities(
expectedSetter.visibility,
expectedSetter.modality,
expectContainingClass?.modality,
actualSetter.visibility,
languageVersionSettings
)