diff options
Diffstat (limited to 'plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt')
| -rw-r--r-- | plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt index 983971446ce0..5020acbd04de 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt @@ -11,10 +11,7 @@ import com.intellij.ui.HoverHyperlinkLabel import com.intellij.util.ui.FormBuilder import com.intellij.util.ui.ThreeStateCheckBox import org.jetbrains.kotlin.cli.common.arguments.* -import org.jetbrains.kotlin.config.CompilerSettings -import org.jetbrains.kotlin.config.createArguments -import org.jetbrains.kotlin.config.isHmpp -import org.jetbrains.kotlin.config.splitArgumentString +import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.idea.KotlinBundle import org.jetbrains.kotlin.idea.compiler.configuration.* import org.jetbrains.kotlin.idea.core.util.onTextChange @@ -119,9 +116,9 @@ class KotlinFacetEditorGeneralTab( } else { editableCommonArguments = configuration!!.settings.compilerArguments!! editableJvmArguments = editableCommonArguments as? K2JVMCompilerArguments - ?: Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JVMCompilerArguments + ?: Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() editableJsArguments = editableCommonArguments as? K2JSCompilerArguments - ?: Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JSCompilerArguments + ?: Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() editableCompilerSettings = configuration.settings.compilerSettings!! } @@ -201,13 +198,10 @@ class KotlinFacetEditorGeneralTab( compilerConfigurable.setTargetPlatform(getChosenPlatform()?.idePlatformKind) compilerConfigurable.setEnabled(!useProjectSettings) if (useProjectSettings) { - compilerConfigurable.commonCompilerArguments = - KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as CommonCompilerArguments? - compilerConfigurable.k2jvmCompilerArguments = - Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JVMCompilerArguments? - compilerConfigurable.k2jsCompilerArguments = - Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() as K2JSCompilerArguments? - compilerConfigurable.compilerSettings = KotlinCompilerSettings.getInstance(project).settings.unfrozen() as CompilerSettings? + compilerConfigurable.commonCompilerArguments = KotlinCommonCompilerArgumentsHolder.getInstance(project).settings.unfrozen() + compilerConfigurable.k2jvmCompilerArguments = Kotlin2JvmCompilerArgumentsHolder.getInstance(project).settings.unfrozen() + compilerConfigurable.k2jsCompilerArguments = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings.unfrozen() + compilerConfigurable.compilerSettings = KotlinCompilerSettings.getInstance(project).settings.unfrozen() } else { compilerConfigurable.commonCompilerArguments = editableCommonArguments compilerConfigurable.k2jvmCompilerArguments = editableJvmArguments |