From 0939907a92d10561549b7946fab7535ee4952b2f Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Sat, 20 Feb 2016 00:15:33 +0100 Subject: [PATCH] Wrong result when use regexp in "find in path" (IDEA-151495) --- .../testSrc/com/intellij/find/FindManagerTest.java | 1 + .../src/com/intellij/find/impl/FindInProjectUtil.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java index c991b1bd3709..9a94173bfcaf 100644 --- a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java +++ b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java @@ -869,6 +869,7 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { assertEquals("public static MyType my = 1;", buildStringToFindForIndicesFromRegExp("public static (@A)? MyType my\\w+? = 1;", myProject)); assertEquals(" Foo ", buildStringToFindForIndicesFromRegExp("\\bFoo\\b", myProject)); assertEquals("", buildStringToFindForIndicesFromRegExp("foo|bar", myProject)); + assertEquals(" Exit Foo Bar Baz", buildStringToFindForIndicesFromRegExp("\\nExit\\tFoo\\rBar\\fBaz", myProject)); } public void testCreateFileMaskCondition() { 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 ef5406a787ba..c9f61dd2afb6 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java @@ -413,7 +413,11 @@ public class FindInProjectUtil { @Override public String fun(PsiElement element) { - return regExpCharPsiClass.isInstance(element) ? element.getText() : " "; + if(regExpCharPsiClass.isInstance(element)) { + String text = element.getText(); + if (!"\\n".equals(text) && !"\\t".equals(text) && !"\\f".equals(text) && !"\\r".equals(text)) return text; + } + return " "; } }, ""); } finally {