From 466410fce746e61fc4493f94c079cc22311b3eb4 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 13 Jan 2020 11:53:49 +0100 Subject: [PATCH] fixing tests after IDEA-230244 GitOrigin-RevId: 093b205495c538a98d2b95169ea0d4a6eba6a497 --- .../compiler/options/ValidationConfigurable.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java index 68a99bc134de..bf0eba94bb83 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java @@ -101,7 +101,7 @@ public class ValidationConfigurable implements SearchableConfigurable, Configura @Override public boolean isModified() { List selectedElements = myValidators.getMarkedElements(); - List markedValidators = getMarkedValidators(); + List markedValidators = getMarkedValidators(ContainerUtil.concat(selectedElements, myValidators.getElements(false))); if (markedValidators.size() != selectedElements.size()) { return true; } @@ -134,15 +134,14 @@ public class ValidationConfigurable implements SearchableConfigurable, Configura @Override public void reset() { myValidateBox.setSelected(myConfiguration.isValidateOnBuild()); - final List validators = getValidators(); - Collections.sort(validators, Comparator.comparing(Compiler::getDescription)); - myValidators.setElements(validators, false); - myValidators.markElements(getMarkedValidators()); + final List allValidators = getValidators(); + Collections.sort(allValidators, Comparator.comparing(Compiler::getDescription)); + myValidators.setElements(allValidators, false); + myValidators.markElements(getMarkedValidators(allValidators)); myExcludedConfigurable.reset(); } - private List getMarkedValidators() { - final List validators = getValidators(); + private List getMarkedValidators(@NotNull List validators) { return ContainerUtil.mapNotNull(validators, (NullableFunction)validator -> myConfiguration.isSelected(validator) ? validator : null); }