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

fix running blocking on EDT; #PY-77850 fixed

Browse Source 
(cherry picked from commit f06465ebffcadc50c564cb815973813d3643673b)

GitOrigin-RevId: 10ded6d4328c5645622a1cd06320279979c2c34d
This commit is contained in:
Aleksandr Sorotskii
2024-12-05 17:10:58 +01:00
committed by intellij-monorepo-bot
parent 6727b2c5cf
commit 1d3e312dd5
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt
View File

@@ -14,6 +14,7 @@ import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.ui.DialogWrapper
import com.intellij.openapi.ui.ValidationInfo import com.intellij.openapi.ui.ValidationInfo
import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.platform.ide.progress.runWithModalProgressBlocking
import com.intellij.platform.ide.progress.withBackgroundProgress import com.intellij.platform.ide.progress.withBackgroundProgress
import com.intellij.ui.IdeBorderFactory import com.intellij.ui.IdeBorderFactory
import com.intellij.ui.components.JBLabel import com.intellij.ui.components.JBLabel
@@ -39,19 +40,21 @@ class PyPoetrySdkConfiguration : PyProjectSdkConfigurationExtension {
private val LOGGER = Logger.getInstance(PyPoetrySdkConfiguration::class.java) private val LOGGER = Logger.getInstance(PyPoetrySdkConfiguration::class.java)
} }
override fun getIntention(module: Module): @IntentionName String? { override fun getIntention(module: Module): @IntentionName String? {
return runBlockingCancellable { return runWithModalProgressBlocking(module.project, PyCharmCommunityCustomizationBundle.message("sdk.dialog.title.setting.up.poetry.environment")) {
val toml = findAmongRoots(module, PY_PROJECT_TOML) val msg: String? = null
if (toml == null) { val toml = findAmongRoots(module, PY_PROJECT_TOML)
return@runBlockingCancellable null if (toml == null) {
} return@runWithModalProgressBlocking null
}
val isPoetry = getPyProjectTomlForPoetry(toml) != null val isPoetry = getPyProjectTomlForPoetry(toml) != null
if (!isPoetry) { if (!isPoetry) {
return@runBlockingCancellable null return@runWithModalProgressBlocking null
} }
PyCharmCommunityCustomizationBundle.message("sdk.set.up.poetry.environment", toml.name) return@runWithModalProgressBlocking PyCharmCommunityCustomizationBundle.message("sdk.set.up.poetry.environment", toml.name)
} }
} }