From 72e24d2fc42ce2b4890925bb963677fc3d37e0b1 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Sun, 21 Feb 2016 22:10:58 +0100 Subject: [PATCH] Wrong result when use regexp in "find in path" (IDEA-151495), 2 --- java/java-tests/testSrc/com/intellij/find/FindManagerTest.java | 2 ++ .../lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java | 2 +- 2 files changed, 3 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 9a94173bfcaf..d7f49ed14a36 100644 --- a/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java +++ b/java/java-tests/testSrc/com/intellij/find/FindManagerTest.java @@ -870,6 +870,8 @@ public class FindManagerTest extends DaemonAnalyzerTestCase { assertEquals(" Foo ", buildStringToFindForIndicesFromRegExp("\\bFoo\\b", myProject)); assertEquals("", buildStringToFindForIndicesFromRegExp("foo|bar", myProject)); assertEquals(" Exit Foo Bar Baz", buildStringToFindForIndicesFromRegExp("\\nExit\\tFoo\\rBar\\fBaz", myProject)); + assertEquals(" Foo Bar Baz Exit", buildStringToFindForIndicesFromRegExp("\\012Foo\\u000ABar\\x0ABaz\\aExit", myProject)); + assertEquals(" Foo Bar BazCooBoo", buildStringToFindForIndicesFromRegExp("\\1Foo\\sBar\\DBaz\\QCoo\\E\\QBoo", 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 c9f61dd2afb6..543d3d9a46eb 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java @@ -415,7 +415,7 @@ public class FindInProjectUtil { public String fun(PsiElement element) { if(regExpCharPsiClass.isInstance(element)) { String text = element.getText(); - if (!"\\n".equals(text) && !"\\t".equals(text) && !"\\f".equals(text) && !"\\r".equals(text)) return text; + if (!text.startsWith("\\")) return text; } return " "; }