MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-79488 Invert conditions in PoetryProjectModelResolver to return early

Browse Source 
GitOrigin-RevId: 590ef130db24fe67fbaead9c9e7ce23dcdf0efd8
This commit is contained in:
Mikhail Golubev
2025-06-11 16:54:32 +00:00
committed by intellij-monorepo-bot
parent 14d3f67525
commit 59577b974f
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/projectModel/poetry/PoetryProjectModelResolver.kt
+9 -10
View File
@@ -70,23 +70,22 @@ object PoetryProjectModelResolver : PythonProjectModelResolver<PoetryProject> {
if (match == null) return@mapNotNull null
val (depName, depUri) = match.destructured
val depPath = runCatching { Path.of(URI(depUri)) }.getOrNull() ?: return@mapNotNull null
if (depPath.isDirectory() && depPath.resolve(PoetryConstants.PYPROJECT_TOML).exists()) {
return@mapNotNull depName to depPath
if (!depPath.isDirectory() || !depPath.resolve(PoetryConstants.PYPROJECT_TOML).exists()) {
return@mapNotNull null
}
return@mapNotNull null
return@mapNotNull depName to depPath
}
.toMap()
val oldStyleModuleDependencies: Map<String, Path> = pyprojectToml.getTableOrEmpty("tool.poetry.dependencies")
val oldStyleModuleDependencies = pyprojectToml.getTableOrEmpty("tool.poetry.dependencies")
.toMap().entries
.mapNotNull { (depName, depSpec) ->
if (depSpec is TomlTable && depSpec.getBoolean("develop") == true) {
val depPath = depSpec.getString("path")?.let { pyprojectTomlPath.parent.resolve(it).normalize() }
if (depPath != null && depPath.isDirectory() && depPath.resolve(PoetryConstants.PYPROJECT_TOML).exists()) {
return@mapNotNull depName to depPath
}
if (depSpec !is TomlTable || depSpec.getBoolean("develop") != true) return@mapNotNull null
val depPath = depSpec.getString("path")?.let { pyprojectTomlPath.parent.resolve(it).normalize() }
if (depPath == null || !depPath.isDirectory() || !depPath.resolve(PoetryConstants.PYPROJECT_TOML).exists()) {
return@mapNotNull null
}
return@mapNotNull null
return@mapNotNull depName to depPath
}
.toMap()