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

put detected vEnv in front of other detected vEnvs

Browse Source
This commit is contained in:
Ekaterina Tuzova
2014-02-12 14:30:34 +04:00
parent d4e77306a7
commit 5df90d47ce
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/configuration/PyConfigurableInterpreterList.java
+9 -1
View File
@@ -27,6 +27,7 @@ import com.jetbrains.python.sdk.PySdkUtil;
import com.jetbrains.python.sdk.PythonSdkAdditionalData;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
import com.jetbrains.python.sdk.flavors.VirtualEnvSdkFlavor;
import javax.swing.*;
import java.util.*;
@@ -75,7 +76,6 @@ public class PyConfigurableInterpreterList {
result.add(sdk);
}
}
Collection<String> sdkHomes = PythonSdkType.getInstance().suggestHomePaths();
Collections.sort(result, new Comparator<Sdk>() {
@Override
@@ -113,6 +113,14 @@ public class PyConfigurableInterpreterList {
return Comparing.compare(o1.getName(), o2.getName());
}
});
Collection<String> sdkHomes = new ArrayList<String>();
sdkHomes.addAll(VirtualEnvSdkFlavor.INSTANCE.suggestHomePaths());
for (PythonSdkFlavor flavor : PythonSdkFlavor.getApplicableFlavors()) {
if (flavor instanceof VirtualEnvSdkFlavor) continue;
sdkHomes.addAll(flavor.suggestHomePaths());
}
for (String sdkHome : SdkConfigurationUtil.filterExistingPaths(PythonSdkType.getInstance(), sdkHomes, getModel().getSdks())) {
result.add(new PyDetectedSdk(sdkHome, PythonSdkType.getInstance()));
}