diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml index 677150ca3660..ea45045544ba 100644 --- a/python/src/META-INF/python-core-common.xml +++ b/python/src/META-INF/python-core-common.xml @@ -658,7 +658,7 @@ - + diff --git a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java index 6de0c34e5d51..c6478a16d594 100644 --- a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java +++ b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java @@ -32,11 +32,10 @@ public class PreferredSdkComparator implements Comparator { @Override public int compare(Sdk o1, Sdk o2) { - for (PySdkWeightProvider provider : Extensions.getExtensions(PySdkWeightProvider.EP_NAME)) { - int weight1 = provider.getWeight(o1); - int weight2 = provider.getWeight(o2); - if(weight1 != weight2) { - return weight2 - weight1; + for (PySdkComparator comparator : Extensions.getExtensions(PySdkComparator.EP_NAME)) { + int result = comparator.compare(o1, o2); + if(result != 0) { + return result; } } diff --git a/python/src/com/jetbrains/python/sdk/PySdkWeightProvider.java b/python/src/com/jetbrains/python/sdk/PySdkComparator.java similarity index 81% rename from python/src/com/jetbrains/python/sdk/PySdkWeightProvider.java rename to python/src/com/jetbrains/python/sdk/PySdkComparator.java index b319aa732655..1e792c3c2261 100644 --- a/python/src/com/jetbrains/python/sdk/PySdkWeightProvider.java +++ b/python/src/com/jetbrains/python/sdk/PySdkComparator.java @@ -21,8 +21,8 @@ import com.intellij.openapi.projectRoots.Sdk; /** * Created by kirylch on 3/29/2017. */ -public interface PySdkWeightProvider { - ExtensionPointName EP_NAME = ExtensionPointName.create("Pythonid.pythonSdkWeightProvider"); +public interface PySdkComparator { + ExtensionPointName EP_NAME = ExtensionPointName.create("Pythonid.pythonSdkComparator"); - int getWeight(Sdk sdk); + int compare(Sdk sdk1, Sdk sdk2); }