MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-77788 Fix Requires Thread annotations

Browse Source 
Merge-request: IJ-MR-150426
Merged-by: Egor Eliseev <Egor.Eliseev@jetbrains.com>

(cherry picked from commit 58bc50470e72e24d85869fb43a2556b6ecc01c61)

IJ-MR-150426

GitOrigin-RevId: 0bb2402914a3fbb9dcda6a868ce87fdbca31af03
This commit is contained in:
Egor Eliseev
2024-11-29 01:44:33 +00:00
committed by intellij-monorepo-bot
parent cf06be9b95
commit cc30351cde
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/src/com/jetbrains/python/sdk/pipenv/ui/PyAddPipEnvPanel.kt
View File

@@ -8,17 +8,18 @@ import com.intellij.openapi.diagnostic.getOrLogException
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleUtil import com.intellij.openapi.module.ModuleUtil
import com.intellij.openapi.progress.runBlockingCancellable
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.ui.TextFieldWithBrowseButton import com.intellij.openapi.ui.TextFieldWithBrowseButton
import com.intellij.openapi.ui.ValidationInfo import com.intellij.openapi.ui.ValidationInfo
import com.intellij.openapi.util.UserDataHolder import com.intellij.openapi.util.UserDataHolder
import com.intellij.platform.ide.progress.ModalTaskOwner
import com.intellij.platform.ide.progress.runWithModalProgressBlocking
import com.intellij.ui.DocumentAdapter import com.intellij.ui.DocumentAdapter
import com.intellij.ui.components.JBCheckBox import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.components.JBTextField import com.intellij.ui.components.JBTextField
import com.intellij.util.PlatformUtils import com.intellij.util.PlatformUtils
import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import com.intellij.util.concurrency.annotations.RequiresEdt
import com.intellij.util.text.nullize import com.intellij.util.text.nullize
import com.intellij.util.ui.FormBuilder import com.intellij.util.ui.FormBuilder
import com.jetbrains.python.PyBundle import com.jetbrains.python.PyBundle
@@ -132,12 +133,12 @@ class PyAddPipEnvPanel(
update() update()
} }
@RequiresBackgroundThread @RequiresEdt
override fun getOrCreateSdk(): Sdk? { override fun getOrCreateSdk(): Sdk? {
PropertiesComponent.getInstance().pipEnvPath = pipEnvPathField.text.nullize() PropertiesComponent.getInstance().pipEnvPath = pipEnvPathField.text.nullize()
val baseSdk = installSdkIfNeeded(baseSdkField.selectedSdk, selectedModule, existingSdks, context).getOrLogException(LOGGER)?.homePath val baseSdk = installSdkIfNeeded(baseSdkField.selectedSdk, selectedModule, existingSdks, context).getOrLogException(LOGGER)?.homePath
return runBlockingCancellable { return runWithModalProgressBlocking(ModalTaskOwner.guess(), PyBundle.message("python.sdk.setting.up.pipenv.title")) {
setupPipEnvSdkUnderProgress(project, selectedModule, existingSdks, newProjectPath, setupPipEnvSdkUnderProgress(project, selectedModule, existingSdks, newProjectPath,
baseSdk, installPackagesCheckBox.isSelected).onSuccess { baseSdk, installPackagesCheckBox.isSelected).onSuccess {
PySdkSettings.instance.preferredVirtualEnvBaseSdk = baseSdk PySdkSettings.instance.preferredVirtualEnvBaseSdk = baseSdk