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

Revert OPT_IN_MARKER_ON_OVERRIDE limitation #KT-48890 Fixed

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
Generated
-6
View File
@@ -36352,12 +36352,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalIsNotEnabled.kt");
}
@Test
@TestMetadata("experimentalOnOverrideWarning.kt")
public void testExperimentalOnOverrideWarning() throws Exception {
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnOverrideWarning.kt");
}
@Test
@TestMetadata("experimentalSetter.kt")
public void testExperimentalSetter() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
Generated
-6
View File
@@ -36352,12 +36352,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalIsNotEnabled.kt");
}
@Test
@TestMetadata("experimentalOnOverrideWarning.kt")
public void testExperimentalOnOverrideWarning() throws Exception {
runTest("compiler/testData/diagnostics/testsWithStdLib/experimental/experimentalOnOverrideWarning.kt");
}
@Test
@TestMetadata("experimentalSetter.kt")
public void testExperimentalSetter() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirOverrideChecker.kt
-22
View File
@@ -346,28 +346,6 @@ object FirOverrideChecker : FirClassChecker() {
reportNotAcceptedOverrideExperimentalities(
overriddenExperimentalities, memberSymbol, context, reporter
)
for (annotation in memberSymbol.fir.annotations) {
val annotationType = annotation.annotationTypeRef.coneTypeSafe<ConeClassLikeType>()
val lookupTag = annotationType?.lookupTag ?: continue
withSuppressedDiagnostics(annotation, context) {
val useSiteTarget = annotation.useSiteTarget
if (useSiteTarget == null || useSiteTarget == AnnotationUseSiteTarget.PROPERTY) {
val experimentality = lookupTag.toFirRegularClassSymbol(session)?.loadExperimentalityForMarkerAnnotation()
if (experimentality != null && experimentality !in overriddenExperimentalities && overriddenMemberSymbols.all {
val ownerClassSymbol = it.dispatchReceiverClassOrNull()?.toFirRegularClassSymbol(session)
ownerClassSymbol == null || !ownerClassSymbol.hasAnnotationItselfOrInParent(context, lookupTag.classId)
}
) {
val factory = if (session.languageVersionSettings.supportsFeature(LanguageFeature.OptInOnOverrideForbidden)) {
FirErrors.OPT_IN_MARKER_ON_OVERRIDE
} else {
FirErrors.OPT_IN_MARKER_ON_OVERRIDE_WARNING
}
reporter.reportOn(annotation.source, factory, context)
}
}
}
}
}
}