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

Kotlin Facet: Avoid rewriting platform version with project settings

Browse Source 
#KT-18373 Fixed
This commit is contained in:
Alexey Sedunov
2017-06-08 20:04:50 +03:00
parent 2e823a4816
commit 0570592952
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+5 -5
View File
@@ -301,17 +301,17 @@ class KotlinFacetEditorGeneralTab(
useProjectSettings = editor.useProjectSettingsCheckBox.isSelected useProjectSettings = editor.useProjectSettingsCheckBox.isSelected
(editor.targetPlatformComboBox.selectedItem as TargetPlatformKind<*>?)?.let { (editor.targetPlatformComboBox.selectedItem as TargetPlatformKind<*>?)?.let {
if (it != targetPlatformKind) { if (it != targetPlatformKind) {
val newCompilerArguments = it.createCompilerArguments()
val platformArguments = when (it) { val platformArguments = when (it) {
is TargetPlatformKind.Jvm -> editor.compilerConfigurable.k2jvmCompilerArguments is TargetPlatformKind.Jvm -> editor.compilerConfigurable.k2jvmCompilerArguments
is TargetPlatformKind.JavaScript -> editor.compilerConfigurable.k2jsCompilerArguments is TargetPlatformKind.JavaScript -> editor.compilerConfigurable.k2jsCompilerArguments
else -> null else -> null
} }
if (platformArguments != null) { compilerArguments = it.createCompilerArguments {
mergeBeans(platformArguments, newCompilerArguments) if (platformArguments != null) {
mergeBeans(platformArguments, this)
}
copyInheritedFields(compilerArguments!!, this)
} }
copyInheritedFields(compilerArguments!!, newCompilerArguments)
compilerArguments = newCompilerArguments
} }
} }
} }