Kotlin Facet: Avoid rewriting platform version with project settings

#KT-18373 Fixed
This commit is contained in:
Alexey Sedunov
2017-06-08 20:04:50 +03:00
parent 2e823a4816
commit 0570592952
@@ -301,17 +301,17 @@ class KotlinFacetEditorGeneralTab(
useProjectSettings = editor.useProjectSettingsCheckBox.isSelected
(editor.targetPlatformComboBox.selectedItem as TargetPlatformKind<*>?)?.let {
if (it != targetPlatformKind) {
val newCompilerArguments = it.createCompilerArguments()
val platformArguments = when (it) {
is TargetPlatformKind.Jvm -> editor.compilerConfigurable.k2jvmCompilerArguments
is TargetPlatformKind.JavaScript -> editor.compilerConfigurable.k2jsCompilerArguments
else -> null
}
if (platformArguments != null) {
mergeBeans(platformArguments, newCompilerArguments)
compilerArguments = it.createCompilerArguments {
if (platformArguments != null) {
mergeBeans(platformArguments, this)
}
copyInheritedFields(compilerArguments!!, this)
}
copyInheritedFields(compilerArguments!!, newCompilerArguments)
compilerArguments = newCompilerArguments
}
}
}