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

RUBY-18217 Show only Ruby 2.2+ for Rails API applications in Ruby Plugin. After review changes

Browse Source
This commit is contained in:
Andrey Vokin
2016-07-20 19:27:51 +02:00
parent 0ea1f3f32f
commit 676dfd784d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class SdkSettingsStep extends ModuleWizardStep {
sdkFilter = JdkComboBox.getSdkFilter(sdkTypeIdFilter);
}
myJdkComboBox = new JdkComboBox(myModel, sdkFilter, sdkTypeIdFilter, true);
myJdkComboBox = new JdkComboBox(myModel, sdkTypeIdFilter, sdkFilter, sdkTypeIdFilter, true);
myJdkPanel = new JPanel(new GridBagLayout());
final PropertiesComponent component = project == null ? PropertiesComponent.getInstance() : PropertiesComponent.getInstance(project);
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
+8 -6
View File
@@ -66,14 +66,15 @@ public class JdkComboBox extends ComboBoxWithWidePopup {
public JdkComboBox(@NotNull final ProjectSdksModel jdkModel,
@Nullable Condition<SdkTypeId> filter) {
this(jdkModel, getSdkFilter(filter), filter, false);
this(jdkModel, filter, getSdkFilter(filter), filter, false);
}
public JdkComboBox(@NotNull final ProjectSdksModel jdkModel,
@Nullable Condition<SdkTypeId> sdkTypeFilter,
@Nullable Condition<Sdk> filter,
@Nullable Condition<SdkTypeId> creationFilter,
boolean addSuggestedItems) {
super(new JdkComboBoxModel(jdkModel, filter, addSuggestedItems));
super(new JdkComboBoxModel(jdkModel, sdkTypeFilter, filter, addSuggestedItems));
myFilter = filter;
myCreationFilter = creationFilter;
setRenderer(new ProjectJdkListRenderer() {
@@ -289,7 +290,8 @@ public class JdkComboBox extends ComboBoxWithWidePopup {
}
private static class JdkComboBoxModel extends DefaultComboBoxModel {
public JdkComboBoxModel(final ProjectSdksModel jdksModel, @Nullable Condition<Sdk> sdkFilter, boolean addSuggested) {
public JdkComboBoxModel(final ProjectSdksModel jdksModel, @Nullable Condition<SdkTypeId> sdkTypeFilter,
@Nullable Condition<Sdk> sdkFilter, boolean addSuggested) {
Sdk[] jdks = jdksModel.getSdks();
Arrays.sort(jdks, (s1, s2) -> s1.getName().compareToIgnoreCase(s2.getName()));
for (Sdk jdk : jdks) {
@@ -298,14 +300,14 @@ public class JdkComboBox extends ComboBoxWithWidePopup {
}
}
if (addSuggested) {
addSuggestedItems(sdkFilter, jdks);
addSuggestedItems(sdkTypeFilter, jdks);
}
}
protected void addSuggestedItems(@Nullable Condition<Sdk> sdkFilter, Sdk[] jdks) {
protected void addSuggestedItems(@Nullable Condition<SdkTypeId> sdkTypeFilter, Sdk[] jdks) {
SdkType[] types = SdkType.getAllTypes();
for (SdkType type : types) {
if (sdkFilter == null || ContainerUtil.find(jdks, sdkFilter) == null) {
if (sdkTypeFilter == null || sdkTypeFilter.value(type) && ContainerUtil.find(jdks, sdk -> sdk.getSdkType() == type) == null) {
String homePath = type.suggestHomePath();
if (homePath != null && type.isValidSdkHome(homePath)) {
addElement(new SuggestedJdkItem(type, homePath));