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

Wizard: allow dashes for module names

Browse Source 
#KT-35584 fixed
This commit is contained in:
Ilya Kirillov
2020-01-14 15:31:04 +03:00
parent 6acf279a34
commit 029dad4d9e
1 changed files with 4 additions and 2 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/SettingValidator.kt
+4 -2
View File
@@ -32,12 +32,14 @@ object StringValidators {
} }
fun shouldBeValidIdentifier(name: String) = settingValidator { value: String -> fun shouldBeValidIdentifier(name: String) = settingValidator { value: String ->
if (value.any { !it.isLetterOrDigit() && it != '_' }) if (value.any { char -> !char.isLetterOrDigit() && char !in ALLOWED_SPECIAL_CHARS_FOR_IDENTIFIERS })
ValidationResult.ValidationError( ValidationResult.ValidationError(
"${name.capitalize()} should consist only of letters, digits, and underscores" "${name.capitalize()} should consist only of letters, digits, '_', or '-'"
) )
else ValidationResult.OK else ValidationResult.OK
} }
private val ALLOWED_SPECIAL_CHARS_FOR_IDENTIFIERS = setOf('_', '-')
} }
fun List<ValidationResult>.fold() = fold(ValidationResult.OK, ValidationResult::and) fun List<ValidationResult>.fold() = fold(ValidationResult.OK, ValidationResult::and)