proper doing "or" for comma separated masks

This commit is contained in:
Maxim.Mossienko
2015-11-12 17:15:12 +01:00
parent 464e08731f
commit d606fed080
@@ -166,9 +166,9 @@ public class FindInProjectUtil {
for(String mask:masks) {
mask = mask.trim();
if (StringUtil.startsWith(mask, "!")) {
negativePattern += "(" + PatternUtil.convertToRegex(mask.substring(1)) + ")";
negativePattern += (negativePattern.isEmpty() ? "" : "|") + "(" + PatternUtil.convertToRegex(mask.substring(1)) + ")";
} else {
pattern += "(" + PatternUtil.convertToRegex(mask) + ")";
pattern += (pattern.isEmpty() ? "" : "|") + "(" + PatternUtil.convertToRegex(mask) + ")";
}
}