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

[FIR] Fix rendering of SUBCLASS_OPT_IN_INAPPLICABLE

Browse Source
This commit is contained in:
Kirill Rakhman
2023-12-21 14:22:53 +01:00
committed by Space Team
parent 14bdcbfecd
commit dd0e919860
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt
+16 -4
View File
@@ -54,13 +54,19 @@ object FirOptInAnnotationCallChecker : FirAnnotationCallChecker() {
val declaration = context.containingDeclarations.lastOrNull() as? FirClass val declaration = context.containingDeclarations.lastOrNull() as? FirClass
if (declaration != null) { if (declaration != null) {
val kind = declaration.classKind val kind = declaration.classKind
val classKindRepresentation = kind.representation
if (kind == ClassKind.ENUM_CLASS || kind == ClassKind.OBJECT || kind == ClassKind.ANNOTATION_CLASS) { if (kind == ClassKind.ENUM_CLASS || kind == ClassKind.OBJECT || kind == ClassKind.ANNOTATION_CLASS) {
reporter.reportOn(expression.source, FirErrors.SUBCLASS_OPT_IN_INAPPLICABLE, kind.toString(), context) reporter.reportOn(expression.source, FirErrors.SUBCLASS_OPT_IN_INAPPLICABLE, classKindRepresentation, context)
return return
} }
val modality = declaration.modality() val modality = declaration.modality()
if (modality == Modality.FINAL || modality == Modality.SEALED) { if (modality == Modality.FINAL || modality == Modality.SEALED) {
reporter.reportOn(expression.source, FirErrors.SUBCLASS_OPT_IN_INAPPLICABLE, "$modality $kind", context) reporter.reportOn(
expression.source,
FirErrors.SUBCLASS_OPT_IN_INAPPLICABLE,
"${modality.name.lowercase()} $classKindRepresentation",
context,
)
return return
} }
if (declaration.isFun) { if (declaration.isFun) {
@@ -68,7 +74,7 @@ object FirOptInAnnotationCallChecker : FirAnnotationCallChecker() {
return return
} }
if (declaration.isLocal) { if (declaration.isLocal) {
reporter.reportOn(expression.source, FirErrors.SUBCLASS_OPT_IN_INAPPLICABLE, "local $kind", context) reporter.reportOn(expression.source, FirErrors.SUBCLASS_OPT_IN_INAPPLICABLE, "local $classKindRepresentation", context)
return return
} }
} }
@@ -77,10 +83,16 @@ object FirOptInAnnotationCallChecker : FirAnnotationCallChecker() {
} }
} }
private val ClassKind.representation: String
get() = when (this) {
ClassKind.ENUM_ENTRY -> "enum entry"
else -> codeRepresentation!!
}
private fun checkOptInIsEnabled( private fun checkOptInIsEnabled(
element: KtSourceElement?, element: KtSourceElement?,
context: CheckerContext, context: CheckerContext,
reporter: DiagnosticReporter reporter: DiagnosticReporter,
) { ) {
val languageVersionSettings = context.session.languageVersionSettings val languageVersionSettings = context.session.languageVersionSettings
val optInFqNames = languageVersionSettings.getFlag(AnalysisFlags.optIn) val optInFqNames = languageVersionSettings.getFlag(AnalysisFlags.optIn)