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

[FE] Revert prohibition of protected members inside actual final classes

Browse Source 
^KT-28850 Fixed
This commit is contained in:
Roman Efremov
2023-04-06 10:11:41 +02:00
committed by Space Team
parent 88488f4dc9
commit 9044dfe394
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt
+4 -4
View File
@@ -180,12 +180,12 @@ object ModifierCheckerCore {
)
return true
}
if (modifier == PROTECTED_KEYWORD && isFinalExpectOrActualClass(parentDescriptor)) {
if (modifier == PROTECTED_KEYWORD && isFinalExpectClass(parentDescriptor)) {
trace.report(
Errors.WRONG_MODIFIER_CONTAINING_DECLARATION.on(
node.psi,
modifier,
"final expect or actual class"
"final expect class"
)
)
}
@@ -247,7 +247,7 @@ object ModifierCheckerCore {
return true
}
private fun isFinalExpectOrActualClass(d: DeclarationDescriptor?): Boolean {
return d is ClassDescriptor && d.isFinalOrEnum && (d.isExpect || d.isActual)
private fun isFinalExpectClass(d: DeclarationDescriptor?): Boolean {
return d is ClassDescriptor && d.isFinalOrEnum && d.isExpect
}
}