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

Wizard: minor, move out module validators from Module class

Browse Source
This commit is contained in:
Ilya Kirillov
2020-03-07 23:38:50 +03:00
parent a88a19a1b9
commit 81c7cb20f3
1 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Module.kt
+43 -31
View File
@@ -40,37 +40,10 @@ class Module(
val kind: ModuleKind
get() = configurator.moduleKind
override val validator: SettingValidator<Module> = settingValidator<Module> { module ->
StringValidators.shouldNotBeBlank("Module name").validate(this, module.name)
} and settingValidator { module ->
StringValidators.shouldBeValidIdentifier("Module name `$name`", ALLOWED_SPECIAL_CHARS_IN_MODULE_NAMES).validate(this, module.name)
} and settingValidator { module ->
withSettingsOf(module) {
allSettingsOfModuleConfigurator(configurator).map { setting ->
val reference = when (setting) {
is PluginSetting<Any, SettingType<Any>> -> setting.reference
is ModuleConfiguratorSetting<Any, SettingType<Any>> -> setting.reference
else -> null
}
val value = reference?.notRequiredSettingValue
?: reference?.savedOrDefaultValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
(setting.validator as SettingValidator<Any>).validate(this@settingValidator, value)
}.fold()
}
} and settingValidator { module ->
val template = module.template ?: return@settingValidator ValidationResult.OK
org.jetbrains.kotlin.tools.projectWizard.templates.withSettingsOf(module) {
template.settings.map { setting ->
val value = setting.reference.notRequiredSettingValue
?: setting.reference.savedOrDefaultValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
(setting.validator as SettingValidator<Any>).validate(this@settingValidator, value)
}.fold()
}
} and inValidatorContext { module ->
validateList(module.subModules)
}
override val validator = moduleNameValidator and
moduleConfiguratorValidator and
moduleTemplateValidator and
subModulesValidator
var subModules = subModules
set(value) {
@@ -115,6 +88,45 @@ class Module(
val (submodules) = map.parseValue(this, path, "subModules", listParser(Module.parser)) { emptyList() }
Module(name, configurator, template, sourcesets, submodules, identificator = identificator)
}
private val moduleNameValidator = settingValidator<Module> { module ->
StringValidators.shouldNotBeBlank("Module name").validate(this, module.name)
} and settingValidator { module ->
StringValidators.shouldBeValidIdentifier("Module name `${module.name}`", ALLOWED_SPECIAL_CHARS_IN_MODULE_NAMES)
.validate(this, module.name)
}
val moduleConfiguratorValidator = settingValidator<Module> { module ->
withSettingsOf(module) {
allSettingsOfModuleConfigurator(module.configurator).map { setting ->
val reference = when (setting) {
is PluginSetting<Any, SettingType<Any>> -> setting.reference
is ModuleConfiguratorSetting<Any, SettingType<Any>> -> setting.reference
else -> null
}
val value = reference?.notRequiredSettingValue
?: reference?.savedOrDefaultValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
(setting.validator as SettingValidator<Any>).validate(this@settingValidator, value)
}.fold()
}
}
val moduleTemplateValidator = settingValidator<Module> { module ->
val template = module.template ?: return@settingValidator ValidationResult.OK
org.jetbrains.kotlin.tools.projectWizard.templates.withSettingsOf(module) {
template.settings.map { setting ->
val value = setting.reference.notRequiredSettingValue
?: setting.reference.savedOrDefaultValue
?: return@map ValidationResult.ValidationError("${setting.title.capitalize()} should not be blank")
(setting.validator as SettingValidator<Any>).validate(this@settingValidator, value)
}.fold()
}
}
val subModulesValidator = inValidatorContext<Module> { module ->
validateList(module.subModules)
}
}
}