MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 23:31:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

python-psi-impl extracted

Browse Source 
GitOrigin-RevId: e3d808c147ac793701c7b628dbf825a99bb71f2a
This commit is contained in:
Dmitry Trofimov
2019-09-09 04:12:52 +02:00
committed by intellij-monorepo-bot
parent 55fbfb54c2
commit a0bc048dcc
728 changed files with 3029 additions and 2587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ class PyVirtualEnvTerminalCustomizer : LocalTerminalCustomizer() {
val sdk: Sdk? = findSdk(project)
if (sdk != null &&
(PythonSdkType.isVirtualEnv(sdk) || PythonSdkType.isConda(sdk)) &&
(PythonSdkUtil.isVirtualEnv(sdk) || PythonSdkUtil.isConda(sdk)) &&
PyVirtualEnvTerminalSettings.getInstance(project).virtualEnvActivate) {
// in case of virtualenv sdk on unix we activate virtualenv
val path = sdk.homePath
@@ -69,8 +69,8 @@ class PyVirtualEnvTerminalCustomizer : LocalTerminalCustomizer() {
private fun findSdk(project: Project): Sdk? {
for (m in ModuleManager.getInstance(project).modules) {
val sdk: Sdk? = PythonSdkType.findPythonSdk(m)
if (sdk != null && !PythonSdkType.isRemote(sdk)) {
val sdk: Sdk? = PythonSdkUtil.findPythonSdk(m)
if (sdk != null && !PythonSdkUtil.isRemote(sdk)) {
return sdk
}
}