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

Temporary fix code before proper support of UnsafeVariance in NI

Browse Source 
See #KT-34433
This commit is contained in:
Mikhail Zarechenskiy
2020-02-10 01:49:32 +03:00
parent c64577b735
commit 599ff4711e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt
+2 -2
View File
@@ -309,7 +309,7 @@ class ValueSettingType<V : Any>(
) : SettingBuilder<V, ValueSettingType<V>>(path, title, neededAtPhase) { ) : SettingBuilder<V, ValueSettingType<V>>(path, title, neededAtPhase) {
init { init {
validate { value -> validate { value ->
if (value is Validatable<*>) value.validator.validate(this, value) if (value is Validatable<*>) (value.validator as SettingValidator<Any>).validate(this, value)
else ValidationResult.OK else ValidationResult.OK
} }
} }
@@ -354,7 +354,7 @@ class ListSettingType<V : Any>(private val parser: Parser<V>) : SettingType<List
validate { values -> validate { values ->
values.fold(ValidationResult.OK as ValidationResult) { result, value -> values.fold(ValidationResult.OK as ValidationResult) { result, value ->
result and when (value) { result and when (value) {
is Validatable<*> -> value.validator.validate(this, value) is Validatable<*> -> (value.validator as SettingValidator<Any>).validate(this, value)
else -> ValidationResult.OK else -> ValidationResult.OK
} }
} }
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt
+2 -2
View File
@@ -39,7 +39,7 @@ class Module(
val value = setting.reference.notRequiredSettingValue val value = setting.reference.notRequiredSettingValue
?: setting.defaultValue ?: setting.defaultValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank") ?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
setting.validator.validate(this@settingValidator, value) (setting.validator as SettingValidator<Any>).validate(this@settingValidator, value)
}.fold() }.fold()
} }
} and settingValidator { module -> } and settingValidator { module ->
@@ -49,7 +49,7 @@ class Module(
val value = setting.reference.notRequiredSettingValue val value = setting.reference.notRequiredSettingValue
?: setting.defaultValue ?: setting.defaultValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank") ?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
setting.validator.validate(this@settingValidator, value) (setting.validator as SettingValidator<Any>).validate(this@settingValidator, value)
}.fold() }.fold()
} }
} and inValidatorContext { module -> } and inValidatorContext { module ->
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt
+1 -1
View File
@@ -23,7 +23,7 @@ abstract class Wizard(createPlugins: PluginsCreator, val servicesManager: Servic
context.settingContext.allPluginSettings.map { setting -> context.settingContext.allPluginSettings.map { setting ->
val value = context.settingContext.pluginSettingValue(setting) ?: return@map ValidationResult.OK val value = context.settingContext.pluginSettingValue(setting) ?: return@map ValidationResult.OK
when (setting.neededAtPhase) { when (setting.neededAtPhase) {
in phases -> setting.validator.validate(this, value) in phases -> (setting.validator as SettingValidator<Any>).validate(this, value)
else -> ValidationResult.OK else -> ValidationResult.OK
} }
}.fold(ValidationResult.OK, ValidationResult::and).toResult() }.fold(ValidationResult.OK, ValidationResult::and).toResult()