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

Wizard: do not suggest invalid groupId

Browse Source
This commit is contained in:
Ilya Kirillov
2020-01-18 01:11:32 +03:00
parent 1b4e282540
commit 09b50a209b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt
+9 -1
View File
@@ -49,6 +49,7 @@ class NewProjectWizardModuleBuilder : EmptyModuleBuilder() {
companion object { companion object {
const val MODULE_BUILDER_ID = "kotlin.newProjectWizard.builder" const val MODULE_BUILDER_ID = "kotlin.newProjectWizard.builder"
private const val DEFAULT_GROUP_ID = "me.user"
} }
override fun isAvailable(): Boolean = NewProjectWizardService.isEnabled override fun isAvailable(): Boolean = NewProjectWizardService.isEnabled
@@ -118,7 +119,14 @@ class NewProjectWizardModuleBuilder : EmptyModuleBuilder() {
settingsStep.safeAs<ProjectSettingsStep>()?.bindModuleSettings() settingsStep.safeAs<ProjectSettingsStep>()?.bindModuleSettings()
wizard.artifactId = suggestedProjectName wizard.artifactId = suggestedProjectName
wizard.groupId = SystemProperties.getUserName()?.let { "me.$it" } ?: suggestedProjectName wizard.groupId = suggestGroupId()
}
private fun suggestGroupId(): String {
val username = SystemProperties.getUserName() ?: return DEFAULT_GROUP_ID
if (!username.matches("[\\w\\s]+".toRegex())) return DEFAULT_GROUP_ID
val usernameAsGroupId = username.trim().toLowerCase().split("\\s+".toRegex()).joinToString(separator = ".")
return "me.$usernameAsGroupId"
} }
override fun getCustomOptionsStep(context: WizardContext?, parentDisposable: Disposable?) = override fun getCustomOptionsStep(context: WizardContext?, parentDisposable: Disposable?) =