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

Wizard: allow "-" char in artifactId/groupId & fix their error messages

Browse Source 
#KT-37820 fixed
This commit is contained in:
Ilya Kirillov
2020-03-30 12:01:00 +03:00
parent 630adb34db
commit fef3ea573b
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties
+1 -1
View File
@@ -49,7 +49,7 @@ plugin.android.setting.sdk=Android SDK
validation.should.not.be.blank={0} should not be blank
validation.identifier={0} should consist only of letters, digits{1}
validation.identifier.additional.symbols=", and symbols: {0}
validation.identifier.additional.symbols=, and symbols: {0}
validation.file.should.exists=File for {0} should exists
version.error.bad.format=Bad version format for setting {0}
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/entity/settings/SettingType.kt
+1 -1
View File
@@ -30,7 +30,7 @@ object StringSettingType : SettingType<String>() {
class Builder(
path: String,
private val title: String,
val title: String,
neededAtPhase: GenerationPhase
) : SettingBuilder<String, StringSettingType>(path, title, neededAtPhase) {
fun shouldNotBeBlank() {
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/plugins/StructurePlugin.kt
+9 -3
View File
@@ -33,21 +33,21 @@ class StructurePlugin(context: Context) : Plugin(context) {
) {
isSavable = true
shouldNotBeBlank()
validate(StringValidators.shouldBeValidIdentifier(title, setOf('.', '_')))
validate(StringValidators.shouldBeValidIdentifier(title, ALLOWED_SPECIAL_CHARS_IN_GROUP_ID))
}
val artifactId by stringSetting(
KotlinNewProjectWizardBundle.message("plugin.structure.setting.artifact.id"),
GenerationPhase.FIRST_STEP
) {
shouldNotBeBlank()
validate(StringValidators.shouldBeValidIdentifier(title, setOf('_')))
validate(StringValidators.shouldBeValidIdentifier(title, ALLOWED_SPECIAL_CHARS_IN_ARTIFACT_ID))
}
val version by stringSetting(
KotlinNewProjectWizardBundle.message("plugin.structure.setting.version"),
GenerationPhase.FIRST_STEP
) {
shouldNotBeBlank()
validate(StringValidators.shouldBeValidIdentifier(title, setOf('_', '-', '.')))
validate(StringValidators.shouldBeValidIdentifier(title, ALLOWED_SPECIAL_CHARS_IN_VERSION))
defaultValue = value("1.0-SNAPSHOT")
}
@@ -56,6 +56,12 @@ class StructurePlugin(context: Context) : Plugin(context) {
service<FileSystemWizardService>().createDirectory(StructurePlugin::projectPath.reference.settingValue)
}
}
companion object {
private val ALLOWED_SPECIAL_CHARS_IN_GROUP_ID = Module.ALLOWED_SPECIAL_CHARS_IN_MODULE_NAMES + '.'
private val ALLOWED_SPECIAL_CHARS_IN_ARTIFACT_ID = Module.ALLOWED_SPECIAL_CHARS_IN_MODULE_NAMES
private val ALLOWED_SPECIAL_CHARS_IN_VERSION = setOf('_', '-', '.')
}
}
val Reader.projectPath