Merge branch 'master' into 1.15
This commit is contained in:
commit
b88e0be365
1 file changed
+2
-4
@@ -259,9 +259,7 @@ public class SettingsManager
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Collection<ParsedRule<?>> getRulesMatching(String search) {
|
||||||
|
|
||||||
public Collection<ParsedRule<?>> getRulesMatching(String search) {
|
|
||||||
String lcSearch = search.toLowerCase(Locale.ROOT);
|
String lcSearch = search.toLowerCase(Locale.ROOT);
|
||||||
return rules.values().stream().filter(rule ->
|
return rules.values().stream().filter(rule ->
|
||||||
{
|
{
|
||||||
@@ -270,7 +268,7 @@ public class SettingsManager
|
|||||||
if (Sets.newHashSet(rule.description.toLowerCase(Locale.ROOT).split("\\W+")).contains(lcSearch))
|
if (Sets.newHashSet(rule.description.toLowerCase(Locale.ROOT).split("\\W+")).contains(lcSearch))
|
||||||
return true; // contains full term in description, but case insensitive
|
return true; // contains full term in description, but case insensitive
|
||||||
return false;
|
return false;
|
||||||
}).collect(ImmutableList.toImmutableList());
|
}).sorted().collect(ImmutableList.toImmutableList());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int printAllRulesToLog(String category)
|
public int printAllRulesToLog(String category)
|
||||||
|
|||||||
Reference in new issue
Block a user