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

cleanup [python]: reformat code

Browse Source 
(cherry picked from commit 69905fdde004d54b20196dc04922dd8cf07c6475)

GitOrigin-RevId: 30cd6f596dfd3ef8b35428a85a6f59bf21ca370e
This commit is contained in:
Ilya.Kazakevich
2026-06-28 18:45:34 +00:00
committed by intellij-monorepo-bot
parent ed5180618d
commit 0adebecef2
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/management/PythonPackageManager.kt
+1 -1
View File
@@ -325,7 +325,7 @@ abstract class PythonPackageManager @ApiStatus.Internal constructor(
*/
@ApiStatus.Internal
@CheckReturnValue
internal abstract suspend fun installPackageCommand(
internal abstract suspend fun installPackageCommand(
installRequest: PythonPackageInstallRequest,
options: List<String>,
module: Module? = null,
python/src/com/jetbrains/python/sdk/uv/UvPackageManager.kt
+20 -10
View File
@@ -7,11 +7,11 @@ import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.python.uv.common.UV_TOOL_ID
import com.intellij.python.pyproject.PY_PROJECT_TOML
import com.intellij.python.pyproject.PyProjectToml
import com.intellij.python.pyproject.PyProjectTomlFile
import com.intellij.python.pyproject.model.internal.workspaceBridge.getToolWorkspaceLayout
import com.intellij.python.uv.common.UV_TOOL_ID
import com.intellij.util.cancelOnDispose
import com.jetbrains.python.PyBundle.message
import com.jetbrains.python.Result
@@ -40,17 +40,19 @@ import com.jetbrains.python.packaging.pip.PipRepositoryManager
import com.jetbrains.python.packaging.pyRequirement
import com.jetbrains.python.packaging.utils.PyPackageCoroutine
import com.jetbrains.python.requirements.PyDependenciesFile
import com.jetbrains.python.requirements.RequirementsTxtFile
import com.jetbrains.python.sdk.PythonSdkAdditionalData
import kotlinx.coroutines.Deferred
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.VisibleForTesting
import java.nio.file.Path
@ApiStatus.Internal
internal class UvPackageManager internal constructor(project: Project, sdk: Sdk, uvExecutionContextDeferred: Deferred<UvExecutionContext<*>>) : PythonPackageManager(project, sdk) {
internal class UvPackageManager internal constructor(
project: Project,
sdk: Sdk,
uvExecutionContextDeferred: Deferred<UvExecutionContext<*>>,
) : PythonPackageManager(project, sdk) {
override val installedPackagesIncludeTransitive: Boolean = true
override val repositoryManager: PythonRepositoryManager = PipRepositoryManager.getInstance(project)
override val treeProvider = CachedDependencyTreeProvider {
@@ -76,7 +78,11 @@ internal class UvPackageManager internal constructor(project: Project, sdk: Sdk,
}
}
override suspend fun installPackageCommand(installRequest: PythonPackageInstallRequest, options: List<String>, module: Module?): PyResult<Unit> {
override suspend fun installPackageCommand(
installRequest: PythonPackageInstallRequest,
options: List<String>,
module: Module?,
): PyResult<Unit> {
return withUv { uv ->
if (sdk.uvUsePackageManagement) {
uv.installPackage(installRequest, emptyList())
@@ -134,7 +140,7 @@ internal class UvPackageManager internal constructor(project: Project, sdk: Sdk,
override suspend fun getPackageTree(): PackageStructureNode {
val allTrees = treeProvider.getDependencyTrees()
val declaredPackageNames = declaredPackagesFromTrees(allTrees).getOrNull()
?.mapTo(mutableSetOf()) { it.name } ?: emptySet()
?.mapTo(mutableSetOf()) { it.name } ?: emptySet()
val workspaceTree = buildWorkspaceStructure(allTrees, declaredPackageNames)
if (workspaceTree != null) return workspaceTree
@@ -149,7 +155,7 @@ internal class UvPackageManager internal constructor(project: Project, sdk: Sdk,
declaredPackageNames: Set<String>,
): List<PackageTreeNode> {
val projectRoot = allTrees.firstOrNull()
?: return declaredPackageNames.map { createLeafNode(it) }
?: return declaredPackageNames.map { createLeafNode(it) }
val childrenByName = projectRoot.children.associateBy { it.name.name }
return declaredPackageNames.map { name -> childrenByName[name] ?: createLeafNode(name) }
}
@@ -239,7 +245,11 @@ internal class UvPackageManager internal constructor(project: Project, sdk: Sdk,
/**
* Removes declared dependencies using UV package manager.
*/
private suspend fun uninstallDeclaredPackages(uv: UvLowLevel<*>, packages: List<PyPackageName>, workspaceMember: PyWorkspaceMember?): PyResult<Unit> {
private suspend fun uninstallDeclaredPackages(
uv: UvLowLevel<*>,
packages: List<PyPackageName>,
workspaceMember: PyWorkspaceMember?,
): PyResult<Unit> {
return if (packages.isNotEmpty()) {
uv.removeDependencies(packages.map { it.name }.toTypedArray(), workspaceMember)
}
@@ -275,7 +285,7 @@ internal class UvPackageManager internal constructor(project: Project, sdk: Sdk,
}
}
override fun updateLockedAction(): suspend () -> PyResult<Unit> = suspend { syncLocked().mapSuccess { } }
override fun updateLockedAction(): suspend () -> PyResult<Unit> = suspend { syncLocked().mapSuccess { } }
private suspend fun resolvePackageName(module: Module): String {
val pyProjectFile = PyProjectToml.findPyProjectTomlFile(module) ?: return module.name
@@ -304,7 +314,7 @@ internal class UvPackageManager internal constructor(project: Project, sdk: Sdk,
val request = PythonPackageInstallRequest.ByRepositoryPythonPackageSpecifications(listOf(specification))
withUv { uv ->
uv.addDependency(request, emptyList())
uv.addDependency(request, emptyList())
}.getOr { return@withContext false }
return@withContext true