Revert OPT_IN_MARKER_ON_OVERRIDE limitation #KT-48890 Fixed

This commit is contained in:
Mikhail Glukhikh
2022-01-26 13:29:30 +03:00
committed by Space
parent 0c49ae04cb
commit c2f43dd98e
10 changed files with 2 additions and 94 deletions
@@ -82,22 +82,6 @@ class ExperimentalMarkerDeclarationAnnotationChecker(private val module: ModuleD
) {
trace.report(Errors.OPT_IN_MARKER_ON_WRONG_TARGET.on(entry, "field"))
}
if (annotated is KtCallableDeclaration &&
annotated !is KtPropertyAccessor &&
annotationUseSiteTarget == null &&
annotated.hasModifier(KtTokens.OVERRIDE_KEYWORD)
) {
val descriptor = trace.get(BindingContext.DECLARATION_TO_DESCRIPTOR, annotated)
if (descriptor is CallableMemberDescriptor &&
!descriptor.hasExperimentalOverriddenDescriptors(annotationClass.fqNameSafe)
) {
if (languageVersionSettings.supportsFeature(LanguageFeature.OptInOnOverrideForbidden)) {
trace.report(Errors.OPT_IN_MARKER_ON_OVERRIDE.on(entry))
} else {
trace.report(Errors.OPT_IN_MARKER_ON_OVERRIDE_WARNING.on(entry))
}
}
}
}
}