From 52e45d04f2821981490b80f9fba27a389d3a7e2d Mon Sep 17 00:00:00 2001 From: Kiryl Chetyrbak Date: Wed, 29 Mar 2017 15:42:07 -0400 Subject: [PATCH 1/4] Added extension point to allow extend functionality of Python PreferredSdkComparator --- python/src/META-INF/python-core-common.xml | 1 + .../python/sdk/PreferredSdkComparator.java | 12 +++++++- .../python/sdk/PySdkWeightProvider.java | 28 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 python/src/com/jetbrains/python/sdk/PySdkWeightProvider.java diff --git a/python/src/META-INF/python-core-common.xml b/python/src/META-INF/python-core-common.xml index 7af2fee357a4..677150ca3660 100644 --- a/python/src/META-INF/python-core-common.xml +++ b/python/src/META-INF/python-core-common.xml @@ -658,6 +658,7 @@ + diff --git a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java index 4466b2f3d4b4..85a68932962b 100644 --- a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java +++ b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java @@ -15,9 +15,11 @@ */ package com.jetbrains.python.sdk; +import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.Comparing; import com.jetbrains.python.sdk.flavors.CPythonSdkFlavor; +import com.jetbrains.python.sdk.flavors.PythonFlavorProvider; import com.jetbrains.python.sdk.flavors.PythonSdkFlavor; import java.util.Comparator; @@ -54,6 +56,14 @@ public class PreferredSdkComparator implements Comparator { return flavor2weight - flavor1weight; } + for (PySdkWeightProvider provider : Extensions.getExtensions(PySdkWeightProvider.EP_NAME)) { + int weight1 = provider.getWeight(o1); + int weight2 = provider.getWeight(o2); + if(weight1 != weight2) { + return weight2 - weight1; + } + } + return -Comparing.compare(o1.getVersionString(), o2.getVersionString()); } -} +} \ No newline at end of file diff --git a/python/src/com/jetbrains/python/sdk/PySdkWeightProvider.java b/python/src/com/jetbrains/python/sdk/PySdkWeightProvider.java new file mode 100644 index 000000000000..b319aa732655 --- /dev/null +++ b/python/src/com/jetbrains/python/sdk/PySdkWeightProvider.java @@ -0,0 +1,28 @@ +/* + * Copyright 2000-2017 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.jetbrains.python.sdk; + +import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.projectRoots.Sdk; + +/** + * Created by kirylch on 3/29/2017. + */ +public interface PySdkWeightProvider { + ExtensionPointName EP_NAME = ExtensionPointName.create("Pythonid.pythonSdkWeightProvider"); + + int getWeight(Sdk sdk); +} From 0086ec4a70558464542154777c477c9f38af511d Mon Sep 17 00:00:00 2001 From: Kiryl Chetyrbak Date: Tue, 4 Apr 2017 13:10:04 -0400 Subject: [PATCH 2/4] Moved extension comparing to beginning --- .../python/sdk/PreferredSdkComparator.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java index 85a68932962b..6de0c34e5d51 100644 --- a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java +++ b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java @@ -32,6 +32,14 @@ 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; + } + } + final PythonSdkFlavor flavor1 = PythonSdkFlavor.getFlavor(o1); final PythonSdkFlavor flavor2 = PythonSdkFlavor.getFlavor(o2); int remote1Weight = PySdkUtil.isRemote(o1) ? 0 : 1; @@ -50,20 +58,13 @@ public class PreferredSdkComparator implements Comparator { if (venv1weight != venv2weight) { return venv2weight - venv1weight; } + int flavor1weight = flavor1 instanceof CPythonSdkFlavor ? 1 : 0; int flavor2weight = flavor2 instanceof CPythonSdkFlavor ? 1 : 0; if (flavor1weight != flavor2weight) { return flavor2weight - flavor1weight; } - for (PySdkWeightProvider provider : Extensions.getExtensions(PySdkWeightProvider.EP_NAME)) { - int weight1 = provider.getWeight(o1); - int weight2 = provider.getWeight(o2); - if(weight1 != weight2) { - return weight2 - weight1; - } - } - return -Comparing.compare(o1.getVersionString(), o2.getVersionString()); } } \ No newline at end of file From 2bf4d8e5cedca05a59063fb630a8f008eae82886 Mon Sep 17 00:00:00 2001 From: Kiryl Chetyrbak Date: Wed, 12 Apr 2017 17:36:40 -0400 Subject: [PATCH 3/4] Refactored to actually compare sdk instead of weight providing --- python/src/META-INF/python-core-common.xml | 2 +- .../com/jetbrains/python/sdk/PreferredSdkComparator.java | 9 ++++----- .../{PySdkWeightProvider.java => PySdkComparator.java} | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) rename python/src/com/jetbrains/python/sdk/{PySdkWeightProvider.java => PySdkComparator.java} (81%) 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); } From b80b5b11b2e7b0f1268fa3ef7fe5cce8806794e4 Mon Sep 17 00:00:00 2001 From: Kiryl Chetyrbak Date: Wed, 12 Apr 2017 17:40:01 -0400 Subject: [PATCH 4/4] removed unnecessary import --- python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java index c6478a16d594..9dbf0f77acb5 100644 --- a/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java +++ b/python/src/com/jetbrains/python/sdk/PreferredSdkComparator.java @@ -19,7 +19,6 @@ import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.Comparing; import com.jetbrains.python.sdk.flavors.CPythonSdkFlavor; -import com.jetbrains.python.sdk.flavors.PythonFlavorProvider; import com.jetbrains.python.sdk.flavors.PythonSdkFlavor; import java.util.Comparator;