From e093151afafa488bf5865da9d155e8b48c115055 Mon Sep 17 00:00:00 2001 From: Oleg Shpynov Date: Fri, 8 Oct 2010 17:38:07 +0400 Subject: [PATCH] RUBY-5431 Files with two underscores in the name is invisible to the Camel Case file search --- platform/util/src/com/intellij/psi/codeStyle/NameUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java index 5b7e60d9a560..3bf3aa65052f 100644 --- a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java +++ b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java @@ -159,7 +159,7 @@ public class NameUtil { buffer.append(Character.toLowerCase(c)); } if (!firstIdentifierLetter) { - buffer.append("|[A-Za-z\\s0-9\\$]*[_-]["); + buffer.append("|[A-Za-z\\s0-9\\$]*[_-]+["); buffer.append(c); buffer.append(Character.toLowerCase(c)); buffer.append("]"); @@ -172,7 +172,7 @@ public class NameUtil { buffer.append(Character.toUpperCase(c)); buffer.append(']'); if (lowerCaseWords) { - buffer.append("([a-z\\s0-9\\$]*[-_])?"); + buffer.append("([a-z\\s0-9\\$]*[-_]+)?"); } } else { @@ -195,7 +195,7 @@ public class NameUtil { firstIdentifierLetter = true; } else if (c == ' ') { - buffer.append("([a-z\\s0-9\\$_-]*[\\ _-])+"); + buffer.append("([a-z\\s0-9\\$_-]*[\\ _-]+)+"); firstIdentifierLetter = true; } else {