diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt index d7493445c50..5e72e9d1595 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt @@ -241,7 +241,7 @@ class KotlinFacetEditorGeneralTab( } } - fun initialize() { + fun initializeIfNeeded() { if (isInitialized) return editor.initialize() @@ -277,7 +277,7 @@ class KotlinFacetEditorGeneralTab( } override fun onTabEntering() { - initialize() + initializeIfNeeded() } override fun isModified(): Boolean { @@ -298,6 +298,7 @@ class KotlinFacetEditorGeneralTab( } override fun apply() { + initializeIfNeeded() validateOnce { editor.compilerConfigurable.apply() with(configuration.settings) { diff --git a/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt b/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt index eee482b74e5..134fc832de8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt @@ -39,7 +39,7 @@ class MultipleKotlinFacetEditor( override fun createComponent(): JComponent? { return KotlinFacetEditorGeneralTab.EditorComponent(project, null).apply { initialize() - editors.flatMap { it.editorTabs.filterIsInstance() }.forEach { it.initialize() } + editors.flatMap { it.editorTabs.filterIsInstance() }.forEach { it.initializeIfNeeded() } helper.bind(useProjectSettingsCheckBox, editors) { it.tabEditor.useProjectSettingsCheckBox } helper.bind(targetPlatformComboBox, editors) { it.tabEditor.targetPlatformComboBox } with(compilerConfigurable) {