From d606fed080dd2751d89aef9537c48c3bd58fc776 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Thu, 12 Nov 2015 17:13:25 +0100
Subject: [PATCH] proper doing "or" for comma separated masks

---
 .../src/com/intellij/find/impl/FindInProjectUtil.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
index 18295bdabae2..e0875354d4cd 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
@@ -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) + ")";
       }
     }