[IDE] Drop coroutines KotlinFacetSettings.coroutineSupport

This commit is contained in:
Dmitriy Novozhilov
2020-12-02 13:03:19 +03:00
committed by TeamCityServer
parent 69e1d60b08
commit a8b65bc673
9 changed files with 2 additions and 95 deletions
@@ -136,18 +136,7 @@ fun Project.getLanguageVersionSettings(
compilerSettings.additionalArgumentsAsList
)
val extraLanguageFeatures = additionalArguments.configureLanguageFeatures(MessageCollector.NONE).apply {
configureCoroutinesSupport(
CoroutineSupport.byCompilerArguments(KotlinCommonCompilerArgumentsHolder.getInstance(this@getLanguageVersionSettings).settings),
languageVersion
)
if (isReleaseCoroutines != null) {
put(
LanguageFeature.ReleaseCoroutines,
if (isReleaseCoroutines) LanguageFeature.State.ENABLED else LanguageFeature.State.DISABLED
)
}
}
val extraLanguageFeatures = additionalArguments.configureLanguageFeatures(MessageCollector.NONE)
val extraAnalysisFlags = additionalArguments.configureAnalysisFlags(MessageCollector.NONE).apply {
if (javaTypeEnhancementState != null) put(JvmAnalysisFlags.javaTypeEnhancementState, javaTypeEnhancementState)
@@ -228,7 +217,6 @@ private fun Module.computeLanguageVersionSettings(): LanguageVersionSettings {
}
val languageFeatures = facetSettings?.mergedCompilerArguments?.configureLanguageFeatures(MessageCollector.NONE)?.apply {
configureCoroutinesSupport(facetSettings.coroutineSupport, languageVersion)
configureMultiplatformSupport(facetSettings.targetPlatform?.idePlatformKind, this@computeLanguageVersionSettings)
}.orEmpty()
@@ -281,18 +269,6 @@ private fun parseArguments(
return platformKind.createArguments { parseCommandLineArguments(additionalArguments, this) }
}
fun MutableMap<LanguageFeature, LanguageFeature.State>.configureCoroutinesSupport(
coroutineSupport: LanguageFeature.State?,
languageVersion: LanguageVersion
) {
val state = if (languageVersion >= LanguageVersion.KOTLIN_1_3) {
LanguageFeature.State.ENABLED
} else {
coroutineSupport ?: LanguageFeature.Coroutines.defaultState
}
put(LanguageFeature.Coroutines, state)
}
fun MutableMap<LanguageFeature, LanguageFeature.State>.configureMultiplatformSupport(
platformKind: IdePlatformKind<*>?,
module: Module?