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

Configuration: Ensure facet UI is initialized in apply() call

Browse Source 
#KT-27187 Fixed
This commit is contained in:
Alexey Sedunov
2018-10-02 15:20:41 +03:00
parent 3fcf6e7719
commit 84d9f8250c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+3 -2
View File
@@ -241,7 +241,7 @@ class KotlinFacetEditorGeneralTab(
} }
} }
fun initialize() { fun initializeIfNeeded() {
if (isInitialized) return if (isInitialized) return
editor.initialize() editor.initialize()
@@ -277,7 +277,7 @@ class KotlinFacetEditorGeneralTab(
} }
override fun onTabEntering() { override fun onTabEntering() {
initialize() initializeIfNeeded()
} }
override fun isModified(): Boolean { override fun isModified(): Boolean {
@@ -298,6 +298,7 @@ class KotlinFacetEditorGeneralTab(
} }
override fun apply() { override fun apply() {
initializeIfNeeded()
validateOnce { validateOnce {
editor.compilerConfigurable.apply() editor.compilerConfigurable.apply()
with(configuration.settings) { with(configuration.settings) {
idea/src/org/jetbrains/kotlin/idea/facet/MultipleKotlinFacetEditor.kt
+1 -1
View File
@@ -39,7 +39,7 @@ class MultipleKotlinFacetEditor(
override fun createComponent(): JComponent? { override fun createComponent(): JComponent? {
return KotlinFacetEditorGeneralTab.EditorComponent(project, null).apply { return KotlinFacetEditorGeneralTab.EditorComponent(project, null).apply {
initialize() initialize()
editors.flatMap { it.editorTabs.filterIsInstance<KotlinFacetEditorGeneralTab>() }.forEach { it.initialize() } editors.flatMap { it.editorTabs.filterIsInstance<KotlinFacetEditorGeneralTab>() }.forEach { it.initializeIfNeeded() }
helper.bind(useProjectSettingsCheckBox, editors) { it.tabEditor.useProjectSettingsCheckBox } helper.bind(useProjectSettingsCheckBox, editors) { it.tabEditor.useProjectSettingsCheckBox }
helper.bind(targetPlatformComboBox, editors) { it.tabEditor.targetPlatformComboBox } helper.bind(targetPlatformComboBox, editors) { it.tabEditor.targetPlatformComboBox }
with(compilerConfigurable) { with(compilerConfigurable) {