From 599ff4711e5759b5890f3a5ca93b6d37f7995093 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Mon, 10 Feb 2020 01:49:32 +0300
Subject: [PATCH] Temporary fix code before proper support of UnsafeVariance in
 NI

 See #KT-34433
---
 .../kotlin/tools/projectWizard/core/entity/Setting.kt         | 4 ++--
 .../kotlin/tools/projectWizard/settings/buildsystem/Module.kt | 4 ++--
 .../org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt
index d6b1c58930d..430b604b9e0 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/Setting.kt
@@ -309,7 +309,7 @@ class ValueSettingType<V : Any>(
     ) : SettingBuilder<V, ValueSettingType<V>>(path, title, neededAtPhase) {
         init {
             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
             }
         }
@@ -354,7 +354,7 @@ class ListSettingType<V : Any>(private val parser: Parser<V>) : SettingType<List
             validate { values ->
                 values.fold(ValidationResult.OK as ValidationResult) { result, 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
                     }
                 }
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt
index 47130c6359a..842d2dc7411 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt
@@ -39,7 +39,7 @@ class Module(
                 val value = setting.reference.notRequiredSettingValue
                     ?: setting.defaultValue
                     ?: 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()
         }
     } and settingValidator { module ->
@@ -49,7 +49,7 @@ class Module(
                 val value = setting.reference.notRequiredSettingValue
                     ?: setting.defaultValue
                     ?: 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()
         }
     } and inValidatorContext { module ->
diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt
index 842887a64e3..a0f4fbcfe47 100644
--- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt
+++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/Wizard.kt
@@ -23,7 +23,7 @@ abstract class Wizard(createPlugins: PluginsCreator, val servicesManager: Servic
         context.settingContext.allPluginSettings.map { setting ->
             val value = context.settingContext.pluginSettingValue(setting) ?: return@map ValidationResult.OK
             when (setting.neededAtPhase) {
-                in phases -> setting.validator.validate(this, value)
+                in phases -> (setting.validator as SettingValidator<Any>).validate(this, value)
                 else -> ValidationResult.OK
             }
         }.fold(ValidationResult.OK, ValidationResult::and).toResult()