MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

[PyCharm] use readAction for findSdkForDirectory

Browse Source 
GitOrigin-RevId: 28bc6b35c25a212ad0de6490ab19e0696373597d
This commit is contained in:
Andrey Vokin
2022-11-18 13:49:19 +01:00
committed by intellij-monorepo-bot
parent 62f8663352
commit 7fc185917b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.python.sdk
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.components.PersistentStateComponent
import com.intellij.openapi.components.State
import com.intellij.openapi.components.Storage
@@ -69,11 +70,14 @@ class PyVirtualEnvTerminalCustomizer : LocalTerminalCustomizer() {
workingDirectory: String?,
command: Array<out String>,
envs: MutableMap<String, String>): Array<out String> {
var sdk: Sdk? = null
var sdkByDirectory: Sdk? = null
if (workingDirectory != null) {
sdk = PySdkUtil.findSdkForDirectory(project, Paths.get(workingDirectory), false)
runReadAction {
sdkByDirectory = PySdkUtil.findSdkForDirectory(project, Paths.get(workingDirectory), false)
}
}
val sdk = sdkByDirectory
if (sdk != null &&
(PythonSdkUtil.isVirtualEnv(sdk) || PythonSdkUtil.isConda(sdk)) &&
PyVirtualEnvTerminalSettings.getInstance(project).virtualEnvActivate) {