MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

georgii.zorabov/DS-1289

Browse Source 
DS-1289 added conda env name validation for DSWelcomeScreenCondaNewEnvPanel and DSNewProjectCondaNewEnvPanel


Merge-request: IJ-MR-124631
Merged-by: Georgii Zorabov <georgii.zorabov@jetbrains.com>

GitOrigin-RevId: 80875663d6a8d8ed4e43d68aa3563bfea95b29c0
This commit is contained in:
Georgii.Zorabov
2024-02-21 19:14:22 +00:00
committed by intellij-monorepo-bot
parent c316ade2a0
commit 10ee4ff32b
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
python/src/com/jetbrains/python/sdk/add/target/conda/PyAddCondaPanelModel.kt
View File

@@ -203,21 +203,44 @@ class PyAddCondaPanelModel(val targetConfiguration: TargetEnvironmentConfigurati
* @return either null (if no error) or localized error string
*/
fun getValidationError(): @Nls String? {
val envIdentities = getEnvIdentities().getOrElse { return it.message ?: PyBundle.message("python.sdk.conda.problem.running") }
val envIdentities = condaEnvs.getOrElse {
return it.message ?: PyBundle.message("python.sdk.conda.problem.running")
}.envs.map { it.envIdentity }.filterIsInstance<PyCondaEnvIdentity.NamedEnv>().map { it.envName }
return if (showCreateNewEnvPanelRoProp.get()) {
validateEnvIdentitiesName(envIdentities)
}
else {
null
}
}
/**
* This method ignores the error if condaEnvs are not loaded yet
* @return either null (if no error in name validation) or localized error string
*/
fun getEnvIdentitiesNameValidationError(): @Nls String? {
val envIdentities = getEnvIdentities().getOrElse { return null }
return validateEnvIdentitiesName(envIdentities)
}
if (showCreateNewEnvPanelRoProp.get()) {
// Create new env
val newEnvName = newEnvNameRwProperty.get()
if (!newEnvName.matches(notEmptyRegex)) {
return PyBundle.message("python.sdk.conda.problem.env.empty.invalid")
}
else if (newEnvName in envIdentities) {
return PyBundle.message("python.sdk.conda.problem.env.name.used")
}
/**
* This method returns envIdentities from loaded envs
*/
private fun getEnvIdentities(): Result<List<PyCondaEnvIdentity.NamedEnv>> =
condaEnvs.map { loadedEnvs ->
loadedEnvs.envs.map { it.envIdentity }.filterIsInstance<PyCondaEnvIdentity.NamedEnv>()
}
/**
* @return either null (if no error in name validation) or localized error string
*/
private fun validateEnvIdentitiesName(envIdentities: List<PyCondaEnvIdentity.NamedEnv>): @Nls String? {
// Create new env
val newEnvName = newEnvNameRwProperty.get()
if (!newEnvName.matches(notEmptyRegex)) {
return PyBundle.message("python.sdk.conda.problem.env.empty.invalid")
}
else if (newEnvName in envIdentities.map { it.envName }) {
return PyBundle.message("python.sdk.conda.problem.env.name.used")
}
return null
}