Minor. Move experimental warning disabling to appropriate places.
This commit is contained in:
@@ -338,6 +338,9 @@ object ModifierCheckerCore {
|
|||||||
|
|
||||||
val dependencies = featureDependencies[modifier] ?: return true
|
val dependencies = featureDependencies[modifier] ?: return true
|
||||||
for (dependency in dependencies) {
|
for (dependency in dependencies) {
|
||||||
|
if (dependency == LanguageFeature.Coroutines && languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines)) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
val restrictedTargets = featureDependenciesTargets[dependency]
|
val restrictedTargets = featureDependenciesTargets[dependency]
|
||||||
if (restrictedTargets != null && actualTargets.intersect(restrictedTargets).isEmpty()) {
|
if (restrictedTargets != null && actualTargets.intersect(restrictedTargets).isEmpty()) {
|
||||||
continue
|
continue
|
||||||
|
|||||||
+1
@@ -135,6 +135,7 @@ object BuilderFunctionsCallChecker : CallChecker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun checkCoroutinesFeature(languageVersionSettings: LanguageVersionSettings, diagnosticHolder: DiagnosticSink, reportOn: PsiElement) {
|
fun checkCoroutinesFeature(languageVersionSettings: LanguageVersionSettings, diagnosticHolder: DiagnosticSink, reportOn: PsiElement) {
|
||||||
|
if (languageVersionSettings.supportsFeature(LanguageFeature.ReleaseCoroutines)) return
|
||||||
val diagnosticData = LanguageFeature.Coroutines to languageVersionSettings
|
val diagnosticData = LanguageFeature.Coroutines to languageVersionSettings
|
||||||
when (languageVersionSettings.getFeatureSupport(LanguageFeature.Coroutines)) {
|
when (languageVersionSettings.getFeatureSupport(LanguageFeature.Coroutines)) {
|
||||||
LanguageFeature.State.ENABLED -> {
|
LanguageFeature.State.ENABLED -> {
|
||||||
|
|||||||
@@ -241,12 +241,6 @@ class LanguageVersionSettingsImpl @JvmOverloads constructor(
|
|||||||
override fun getFeatureSupport(feature: LanguageFeature): LanguageFeature.State {
|
override fun getFeatureSupport(feature: LanguageFeature): LanguageFeature.State {
|
||||||
specificFeatures[feature]?.let { return it }
|
specificFeatures[feature]?.let { return it }
|
||||||
|
|
||||||
if (feature == LanguageFeature.Coroutines) {
|
|
||||||
if (getFeatureSupport(LanguageFeature.ReleaseCoroutines) == LanguageFeature.State.ENABLED) {
|
|
||||||
return LanguageFeature.State.ENABLED
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val since = feature.sinceVersion
|
val since = feature.sinceVersion
|
||||||
if (since != null && languageVersion >= since && apiVersion >= feature.sinceApiVersion) {
|
if (since != null && languageVersion >= since && apiVersion >= feature.sinceApiVersion) {
|
||||||
return feature.defaultState
|
return feature.defaultState
|
||||||
|
|||||||
Reference in New Issue
Block a user