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

Python god function renamed

Browse Source 
GitOrigin-RevId: 5481c6b1026bcebd866aed8a283c83ac63918039
This commit is contained in:
Ilya.Kazakevich
2025-04-02 23:46:00 +00:00
committed by intellij-monorepo-bot
parent c38838b59d
commit 065ab05d23
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt
+2 -2
View File
@@ -40,7 +40,7 @@ import com.jetbrains.python.requirements.RequirementsFileType
import com.jetbrains.python.sdk.*
import com.jetbrains.python.sdk.add.v1.PyAddNewVirtualEnvFromFilePanel
import com.jetbrains.python.sdk.configuration.PyProjectSdkConfigurationExtension
import com.jetbrains.python.sdk.configuration.createVirtualEnvSynchronously
import com.jetbrains.python.sdk.configuration.createVirtualEnvAndSdkSynchronously
import java.awt.BorderLayout
import java.awt.Insets
import java.nio.file.Paths
@@ -75,7 +75,7 @@ class PyRequirementsTxtOrSetupPySdkConfiguration : PyProjectSdkConfigurationExte
val sdk = invokeAndWaitIfNeeded {
Disposer.newDisposable("Creating virtual environment").use {
PyTemporarilyIgnoredFileProvider.ignoreRoot(systemIndependentLocation, it)
createVirtualEnvSynchronously(chosenBaseSdk!!, existingSdks, location, projectPath, module.project, module)
createVirtualEnvAndSdkSynchronously(chosenBaseSdk!!, existingSdks, location, projectPath, module.project, module)
}
}
python/python-features-trainer/src/com/intellij/python/featuresTrainer/ift/PythonBasedLangSupport.kt
+2 -2
View File
@@ -25,7 +25,7 @@ import com.jetbrains.python.sdk.*
import com.jetbrains.python.sdk.add.PySdkPathChoosingComboBox
import com.jetbrains.python.sdk.add.addBaseInterpretersAsync
import com.jetbrains.python.sdk.configuration.PyProjectSdkConfiguration.setReadyToUseSdk
import com.jetbrains.python.sdk.configuration.createVirtualEnvSynchronously
import com.jetbrains.python.sdk.configuration.createVirtualEnvAndSdkSynchronously
import com.jetbrains.python.sdk.configuration.findPreferredVirtualEnvBaseSdk
import com.jetbrains.python.statistics.modules
import training.dsl.LessonContext
@@ -94,7 +94,7 @@ abstract class PythonBasedLangSupport : AbstractLangSupport() {
existingSdks: List<Sdk>,
module: Module?): Sdk? {
val venvRoot = FileUtil.toSystemDependentName(PySdkSettings.instance.getPreferredVirtualEnvBasePath(project.basePath))
val venvSdk = createVirtualEnvSynchronously(preferredSdk, existingSdks, venvRoot, project.basePath, project, module, project)
val venvSdk = createVirtualEnvAndSdkSynchronously(preferredSdk, existingSdks, venvRoot, project.basePath, project, module, project)
return venvSdk.also {
SdkConfigurationUtil.addSdk(it)
}
python/src/com/jetbrains/python/sdk/add/v1/PyAddNewVirtualEnvPanel.kt
+3 -3
View File
@@ -22,7 +22,7 @@ import com.jetbrains.python.sdk.add.PyAddNewEnvPanel
import com.jetbrains.python.sdk.add.PySdkPathChoosingComboBox
import com.jetbrains.python.sdk.add.addBaseInterpretersAsync
import com.jetbrains.python.sdk.basePath
import com.jetbrains.python.sdk.configuration.createVirtualEnvSynchronously
import com.jetbrains.python.sdk.configuration.createVirtualEnvAndSdkSynchronously
import com.jetbrains.python.statistics.InterpreterTarget
import com.jetbrains.python.statistics.InterpreterType
import org.jetbrains.annotations.SystemIndependent
@@ -78,8 +78,8 @@ open class PyAddNewVirtualEnvPanel(private val project: Project?,
validateSdkComboBox(baseSdkField, this))
override fun getOrCreateSdk(): Sdk? {
return createVirtualEnvSynchronously(baseSdkField.selectedSdk, existingSdks, pathField.text, newProjectPath, project, module, context,
inheritSitePackagesField.isSelected, makeSharedField.isSelected)
return createVirtualEnvAndSdkSynchronously(baseSdkField.selectedSdk, existingSdks, pathField.text, newProjectPath, project, module, context,
inheritSitePackagesField.isSelected, makeSharedField.isSelected)
}
override fun getStatisticInfo(): InterpreterStatisticsInfo? {
python/src/com/jetbrains/python/sdk/add/v1/PyAddVirtualEnvPanel.kt
+3 -3
View File
@@ -37,7 +37,7 @@ import com.jetbrains.python.sdk.add.PySdkPathChoosingComboBox
import com.jetbrains.python.sdk.add.addBaseInterpretersAsync
import com.jetbrains.python.sdk.add.addInterpretersAsync
import com.jetbrains.python.sdk.configuration.createSdkForTarget
import com.jetbrains.python.sdk.configuration.createVirtualEnvSynchronously
import com.jetbrains.python.sdk.configuration.createVirtualEnvAndSdkSynchronously
import com.jetbrains.python.sdk.detectVirtualEnvs
import com.jetbrains.python.sdk.flavors.PyFlavorAndData
import com.jetbrains.python.sdk.flavors.PyFlavorData
@@ -222,8 +222,8 @@ internal class PyAddVirtualEnvPanel(
else {
baseSelectedSdk
}
return createVirtualEnvSynchronously(baseSdk, existingSdks, virtualenvRoot, projectBasePath, project, module, context,
isInheritSitePackages, false, targetPanelExtension)
return createVirtualEnvAndSdkSynchronously(baseSdk, existingSdks, virtualenvRoot, projectBasePath, project, module, context,
isInheritSitePackages, false, targetPanelExtension)
}
private fun configureExistingVirtualenvSdk(targetEnvironmentConfiguration: TargetEnvironmentConfiguration?, selectedSdk: Sdk): Sdk {
python/src/com/jetbrains/python/sdk/configuration/PyProjectVirtualEnvConfiguration.kt
+6 -1
View File
@@ -33,9 +33,14 @@ import com.jetbrains.python.sdk.flavors.PyFlavorAndData
import com.jetbrains.python.sdk.flavors.PyFlavorData
import com.jetbrains.python.target.PyTargetAwareAdditionalData
import com.jetbrains.python.target.getInterpreterVersion
import org.jetbrains.annotations.ApiStatus
/**
* If you need venv only, please use [com.intellij.python.community.impl.venv.createVenv]: it is cleaner and suspend.
*/
@ApiStatus.Internal
@RequiresEdt
fun createVirtualEnvSynchronously(
fun createVirtualEnvAndSdkSynchronously(
baseSdk: Sdk,
existingSdks: List<Sdk>,
venvRoot: String,