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

Merge branch 'fix/look-through-extension-flavours-for-get-by-sdkpath' of https://github.com/da1z/intellij-community

Browse Source
This commit is contained in:
Dmitry Trofimov
2017-03-30 18:25:49 +02:00
parent 8cb0d7018f 5ec6b98b8c
commit 320673c4e8
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/flavors/PythonSdkFlavor.java
+17 -6
View File
@@ -94,16 +94,21 @@ public abstract class PythonSdkFlavor {
result.addAll(getPlatformIndependentFlavors());
}
for (PythonFlavorProvider provider : Extensions.getExtensions(PythonFlavorProvider.EP_NAME)) {
PythonSdkFlavor flavor = provider.getFlavor(addPlatformIndependent);
if (flavor != null) {
result.add(flavor);
}
}
result.addAll(getPlatformFlavorsFromExtensions(addPlatformIndependent));
return result;
}
public static List<PythonSdkFlavor> getPlatformFlavorsFromExtensions(boolean isInpedendent) {
List<PythonSdkFlavor> result = new ArrayList<>();
for (PythonFlavorProvider provider : Extensions.getExtensions(PythonFlavorProvider.EP_NAME)) {
PythonSdkFlavor flavor = provider.getFlavor(isInpedendent);
if (flavor != null) {
result.add(flavor);
}
}
return result;
}
public static List<PythonSdkFlavor> getPlatformIndependentFlavors() {
List<PythonSdkFlavor> result = Lists.newArrayList();
@@ -149,6 +154,12 @@ public abstract class PythonSdkFlavor {
return flavor;
}
}
for (PythonSdkFlavor flavor: getPlatformFlavorsFromExtensions(true)) {
if (flavor.isValidSdkHome(sdkPath)) {
return flavor;
}
}
return null;
}