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/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirModifierChecker.kt
+4 -4
View File
@@ -250,12 +250,12 @@ object FirModifierChecker : FirBasicDeclarationChecker() {
return true
}
if (modifierToken == KtTokens.PROTECTED_KEYWORD && isFinalExpectOrActualClass(parent)) {
if (modifierToken == KtTokens.PROTECTED_KEYWORD && isFinalExpectClass(parent)) {
reporter.reportOn(
modifierSource,
FirErrors.WRONG_MODIFIER_CONTAINING_DECLARATION,
modifierToken,
"final expect or actual class",
"final expect class",
context,
)
}
@@ -277,7 +277,7 @@ object FirModifierChecker : FirBasicDeclarationChecker() {
return firstOrNull()?.description ?: "this"
}
private fun isFinalExpectOrActualClass(d: FirDeclaration?): Boolean {
return d is FirClass && d.isFinal && (d.isExpect || d.isActual)
private fun isFinalExpectClass(d: FirDeclaration?): Boolean {
return d is FirClass && d.isFinal && d.isExpect
}
}