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

[FIR] Fir modality of FirPropertyAccessor

Browse Source 
^KT-61798 Fixed
Review: https://jetbrains.team/p/kt/reviews/14230/timeline

Q: How resolved modality of an accessor affects expect/actual matching
   algorithm of properties?
A: It's not expect/actual matching of properties, but expect/actual
   matching of properties setter. Declarations (setters in our case) in
   actual are allowed to have wider visibility but only if the
   appropriate expect is `final`. Before this commit, all property
   accessors were always `final` by mistake. After this commit, they
   have the modality derived from their containingProperty.

Related problem: PositionStrategy for ACTUAL_WITHOUT_EXPECT can be
improved KT-65720

The fix in `resolveModality` is similar to how `resolveVisibility` works

Related tests:
- ConfigurationCacheForAndroidIT.testKotlinAndroidProject
- FirIdeNormalAnalysisSourceModuleCombinedDeclaredMemberScopeTestGenerated.testEnumClassWithAbstractMembers
- FirIdeNormalAnalysisSourceModuleCombinedDeclaredMemberScopeTestGenerated.testEnumEntryInitializerWithOverriddenMember
- FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.testDelegateInterfaceLibrary
- FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.testEnumClassWithAbstractMembers
- FirIdeNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.testEnumEntryInitializerWithOverriddenMember
- FirIdeNormalAnalysisSourceModuleMemberScopeTestGenerated.testEnumClassWithAbstractMembers
- FirIdeNormalAnalysisSourceModuleMemberScopeTestGenerated.testEnumEntryInitializerWithOverriddenMember
- FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.testEnumEntryOverride
- FirIdeNormalAnalysisSourceModuleSymbolByPsiTestGenerated.testEnumValueMember
- FirStandaloneNormalAnalysisSourceModuleCombinedDeclaredMemberScopeTestGenerated.testEnumClassWithAbstractMembers
- FirStandaloneNormalAnalysisSourceModuleCombinedDeclaredMemberScopeTestGenerated.testEnumEntryInitializerWithOverriddenMember
- FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.testEnumClassWithAbstractMembers
- FirStandaloneNormalAnalysisSourceModuleDeclaredMemberScopeTestGenerated.testEnumEntryInitializerWithOverriddenMember
- FirStandaloneNormalAnalysisSourceModuleMemberScopeTestGenerated.testEnumClassWithAbstractMembers
- FirStandaloneNormalAnalysisSourceModuleMemberScopeTestGenerated.testEnumEntryInitializerWithOverriddenMember
- DiagnosticCompilerTestFE10TestdataTestGenerated*testChangeSetterVisibilityInOverride
This commit is contained in:
Nikita Bobko
2024-02-06 15:53:04 +01:00
committed by Space Team
parent ab726fee3d
commit 21fff5634e
13 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/enumClassWithAbstractMembers.txt
Vendored
+1 -1
View File
@@ -73,7 +73,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: ABSTRACT
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
analysis/analysis-api/testData/components/scopeProvider/combinedDeclaredMemberScope/enumEntryInitializerWithOverriddenMember.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: true
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/delegateInterfaceLibrary.txt
Vendored
+6 -6
View File
@@ -122,7 +122,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
@@ -173,7 +173,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: OPEN
origin: SOURCE
parameter: KtValueParameterSymbol:
annotationsList: []
@@ -290,7 +290,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: KtReceiverParameterSymbol:
annotationsList: []
@@ -439,7 +439,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
@@ -530,7 +530,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: KtReceiverParameterSymbol:
annotationsList: []
@@ -601,7 +601,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: OPEN
origin: SOURCE
parameter: KtValueParameterSymbol:
annotationsList: []
analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumClassWithAbstractMembers.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: ABSTRACT
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
analysis/analysis-api/testData/components/scopeProvider/declaredMemberScope/enumEntryInitializerWithOverriddenMember.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: true
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
analysis/analysis-api/testData/components/scopeProvider/memberScope/enumClassWithAbstractMembers.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: ABSTRACT
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
analysis/analysis-api/testData/components/scopeProvider/memberScope/enumEntryInitializerWithOverriddenMember.txt
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: true
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
analysis/analysis-api/testData/symbols/symbolByPsi/enumEntryOverride.txt
Vendored
+2 -2
View File
@@ -166,7 +166,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: true
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
@@ -497,7 +497,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
analysis/analysis-api/testData/symbols/symbolByPsi/enumValueMember.txt
Vendored
+2 -2
View File
@@ -170,7 +170,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: true
modality: FINAL
modality: OPEN
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
@@ -278,7 +278,7 @@ KtKotlinPropertySymbol:
isExtension: false
isInline: false
isOverride: false
modality: FINAL
modality: ABSTRACT
origin: SOURCE
receiverParameter: null
returnType: KtUsualClassType:
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirStatusResolver.kt
+5 -5
View File
@@ -10,10 +10,7 @@ import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.impl.FirDeclarationStatusImpl
import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl
import org.jetbrains.kotlin.fir.declarations.utils.effectiveVisibility
import org.jetbrains.kotlin.fir.declarations.utils.isExpect
import org.jetbrains.kotlin.fir.declarations.utils.isOverride
import org.jetbrains.kotlin.fir.declarations.utils.visibility
import org.jetbrains.kotlin.fir.declarations.utils.*
import org.jetbrains.kotlin.fir.extensions.FirStatusTransformerExtension
import org.jetbrains.kotlin.fir.extensions.extensionService
import org.jetbrains.kotlin.fir.extensions.statusTransformerExtensions
@@ -271,7 +268,7 @@ class FirStatusResolver(
} else {
it
}
} ?: resolveModality(declaration, containingClass)
} ?: resolveModality(declaration, containingProperty, containingClass)
if (overriddenStatuses.isNotEmpty()) {
for (modifier in MODIFIERS_FROM_OVERRIDDEN) {
status[modifier] = status[modifier] || overriddenStatuses.fold(false) { acc, overriddenStatus ->
@@ -437,11 +434,13 @@ class FirStatusResolver(
private fun resolveModality(
declaration: FirDeclaration,
containingProperty: FirProperty?,
containingClass: FirClass?,
): Modality {
return when (declaration) {
is FirRegularClass -> if (declaration.classKind == ClassKind.INTERFACE) Modality.ABSTRACT else Modality.FINAL
is FirCallableDeclaration -> {
val containingPropertyModality = containingProperty?.modality
when {
containingClass == null -> Modality.FINAL
containingClass.classKind == ClassKind.INTERFACE -> {
@@ -451,6 +450,7 @@ class FirStatusResolver(
else -> Modality.OPEN
}
}
declaration is FirPropertyAccessor && containingPropertyModality != null -> containingPropertyModality
declaration.isOverride -> Modality.OPEN
else -> Modality.FINAL
}
compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.fir.kt
Vendored
+1 -1
View File
@@ -12,6 +12,6 @@ open class Base {
// FILE: jvm.kt
actual open class Foo : Base() {
override var foo: String = ""
override var <!ACTUAL_WITHOUT_EXPECT!>foo<!>: String = ""
public set
}
compiler/testData/diagnostics/tests/multiplatform/actualClassifierMustHasTheSameMembersAsNonFinalExpectClassifierChecker/changeSetterVisibilityInOverride.ll.kt
Vendored
+1 -1
View File
@@ -12,6 +12,6 @@ expect open class Foo : Base
// FILE: jvm.kt
actual open class Foo : Base() {
override var foo: String = ""
override var <!ACTUAL_WITHOUT_EXPECT!>foo<!>: String = ""
public set
}
compiler/testData/ir/irText/stubs/genericClassInDifferentModule.fir.ir.txt
Vendored
+4 -4
View File
@@ -87,7 +87,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:OPEN <> ($this:<root>.Derived1<T of <root>.Derived1>) returnType:T of <root>.Derived1
correspondingProperty: PROPERTY name:bar visibility:public modality:OPEN [var]
overridden:
public final fun <get-bar> (): T of <root>.Base declared in <root>.Base
public abstract fun <get-bar> (): T of <root>.Base declared in <root>.Base
$this: VALUE_PARAMETER name:<this> type:<root>.Derived1<T of <root>.Derived1>
BLOCK_BODY
RETURN type=kotlin.Nothing from='public open fun <get-bar> (): T of <root>.Derived1 declared in <root>.Derived1'
@@ -96,7 +96,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
FUN DEFAULT_PROPERTY_ACCESSOR name:<set-bar> visibility:public modality:OPEN <> ($this:<root>.Derived1<T of <root>.Derived1>, <set-?>:T of <root>.Derived1) returnType:kotlin.Unit
correspondingProperty: PROPERTY name:bar visibility:public modality:OPEN [var]
overridden:
public final fun <set-bar> (value: T of <root>.Base): kotlin.Unit declared in <root>.Base
public abstract fun <set-bar> (value: T of <root>.Base): kotlin.Unit declared in <root>.Base
$this: VALUE_PARAMETER name:<this> type:<root>.Derived1<T of <root>.Derived1>
VALUE_PARAMETER name:<set-?> index:0 type:T of <root>.Derived1
BLOCK_BODY
@@ -109,7 +109,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
FUN name:<get-exn> visibility:public modality:OPEN <Z> ($this:<root>.Derived1<T of <root>.Derived1>, $receiver:Z of <root>.Derived1.<get-exn>) returnType:T of <root>.Derived1
correspondingProperty: PROPERTY name:exn visibility:public modality:OPEN [var]
overridden:
public final fun <get-exn> <Z> (): T of <root>.Base declared in <root>.Base
public abstract fun <get-exn> <Z> (): T of <root>.Base declared in <root>.Base
TYPE_PARAMETER name:Z index:0 variance: superTypes:[kotlin.Any?] reified:false
$this: VALUE_PARAMETER name:<this> type:<root>.Derived1<T of <root>.Derived1>
$receiver: VALUE_PARAMETER name:<this> type:Z of <root>.Derived1.<get-exn>
@@ -120,7 +120,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
FUN name:<set-exn> visibility:public modality:OPEN <Z> ($this:<root>.Derived1<T of <root>.Derived1>, $receiver:Z of <root>.Derived1.<set-exn>, value:T of <root>.Derived1) returnType:kotlin.Unit
correspondingProperty: PROPERTY name:exn visibility:public modality:OPEN [var]
overridden:
public final fun <set-exn> <Z> (value: T of <root>.Base): kotlin.Unit declared in <root>.Base
public abstract fun <set-exn> <Z> (value: T of <root>.Base): kotlin.Unit declared in <root>.Base
TYPE_PARAMETER name:Z index:0 variance: superTypes:[kotlin.Any?] reified:false
$this: VALUE_PARAMETER name:<this> type:<root>.Derived1<T of <root>.Derived1>
$receiver: VALUE_PARAMETER name:<this> type:Z of <root>.Derived1.<set-exn>