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

Make EXPERIMENTAL_API_USAGE_ERR warning till 1.6 for fake override case

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-07-30 17:37:45 +03:00
committed by teamcityserver
parent 3636118743
commit 5283f7b7c6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExperimentalUsageChecker.kt
+6 -1
View File
@@ -176,7 +176,12 @@ class ExperimentalUsageChecker(project: Project) : CallChecker {
val result = SmartSet.create<Experimentality>() val result = SmartSet.create<Experimentality>()
if (this is CallableMemberDescriptor && kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) { if (this is CallableMemberDescriptor && kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE) {
for (overridden in overriddenDescriptors) { for (overridden in overriddenDescriptors) {
result.addAll(overridden.loadExperimentalities(moduleAnnotationsResolver, languageVersionSettings, visited, useFutureError)) result.addAll(overridden.loadExperimentalities(
moduleAnnotationsResolver,
languageVersionSettings,
visited,
useFutureError = !languageVersionSettings.supportsFeature(LanguageFeature.OptInContagiousSignatures)
))
} }
return result return result
} }
compiler/testData/diagnostics/testsWithStdLib/experimental/implicitUsagesFuture.kt
Vendored
+1 -1
View File
@@ -49,7 +49,7 @@ interface NotExperimentalExtension : ExperimentalType {
fun use(arg: NotExperimentalExtension) { fun use(arg: NotExperimentalExtension) {
arg.foo() arg.foo()
arg.<!EXPERIMENTAL_API_USAGE_ERROR!>bar<!>() arg.<!EXPERIMENTAL_API_USAGE_FUTURE_ERROR!>bar<!>()
} }
@Marker @Marker