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

KotlinFacetEditorGeneralTab refactor: use chosenPlatform when possible

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-09-07 19:56:18 +03:00
parent 622c9bedad
commit 2e29a581f2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/facet/KotlinLibraryValidatorCreator.kt
+1 -1
View File
@@ -28,6 +28,6 @@ class KotlinLibraryValidatorCreator : KotlinFacetValidatorCreator() {
DelegatingLibrariesValidatorContext(editorContext), DelegatingLibrariesValidatorContext(editorContext),
validatorsManager, validatorsManager,
"kotlin" "kotlin"
) { editor.targetPlatformComboBox.selectedItemTyped!! } ) { editor.chosenPlatform!! }
} }
} }
idea/src/org/jetbrains/kotlin/idea/facet/KotlinFacetEditorGeneralTab.kt
+4 -4
View File
@@ -147,13 +147,13 @@ class KotlinFacetEditorGeneralTab(
compilerConfigurable.reset() compilerConfigurable.reset()
} }
private val chosenPlatform: IdePlatform<*, *>? val chosenPlatform: IdePlatform<*, *>?
get() = targetPlatformComboBox.selectedItemTyped get() = targetPlatformComboBox.selectedItemTyped
} }
inner class ArgumentConsistencyValidator : FacetEditorValidator() { inner class ArgumentConsistencyValidator : FacetEditorValidator() {
override fun check(): ValidationResult { override fun check(): ValidationResult {
val platform = editor.targetPlatformComboBox.selectedItemTyped ?: return ValidationResult.OK val platform = editor.chosenPlatform ?: return ValidationResult.OK
val primaryArguments = platform.createArguments().apply { val primaryArguments = platform.createArguments().apply {
editor.compilerConfigurable.applyTo( editor.compilerConfigurable.applyTo(
this, this,
@@ -270,7 +270,7 @@ class KotlinFacetEditorGeneralTab(
override fun isModified(): Boolean { override fun isModified(): Boolean {
if (editor.useProjectSettingsCheckBox.isSelected != configuration.settings.useProjectSettings) return true if (editor.useProjectSettingsCheckBox.isSelected != configuration.settings.useProjectSettings) return true
if (editor.targetPlatformComboBox.selectedItemTyped != configuration.settings.platform) return true if (editor.chosenPlatform != configuration.settings.platform) return true
return !editor.useProjectSettingsCheckBox.isSelected && editor.compilerConfigurable.isModified return !editor.useProjectSettingsCheckBox.isSelected && editor.compilerConfigurable.isModified
} }
@@ -288,7 +288,7 @@ class KotlinFacetEditorGeneralTab(
editor.compilerConfigurable.apply() editor.compilerConfigurable.apply()
with(configuration.settings) { with(configuration.settings) {
useProjectSettings = editor.useProjectSettingsCheckBox.isSelected useProjectSettings = editor.useProjectSettingsCheckBox.isSelected
editor.targetPlatformComboBox.selectedItemTyped?.let { editor.chosenPlatform?.let {
if (it != platform) { if (it != platform) {
val platformArguments = when { val platformArguments = when {
it.isJvm -> editor.compilerConfigurable.k2jvmCompilerArguments it.isJvm -> editor.compilerConfigurable.k2jvmCompilerArguments