From d62cac2b4cfc643acea295d031b79ce8604dfd61 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 6 Jul 2012 14:27:54 +0200
Subject: [PATCH] middle matching with uppercase prefix

---
 .../testSrc/com/intellij/psi/util/NameUtilTest.java           | 4 +++-
 .../util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
index b2261f6a1f09..1b0535d3e279 100644
--- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java
@@ -215,6 +215,8 @@ public class NameUtilTest extends UsefulTestCase {
   }
 
   public void testMiddleMatching() {
+    assertTrue(caseInsensitiveMatcher("*OLD").matches("folder"));
+    assertTrue(caseInsensitiveMatcher("*old").matches("folder"));
     assertMatches("SWU*H*7", "SWUpgradeHdlrFSPR7Test");
     assertMatches("SWU*H*R", "SWUpgradeHdlrFSPR7Test");
     assertMatches("SWU*H*R", "SWUPGRADEHDLRFSPR7TEST");
@@ -222,7 +224,7 @@ public class NameUtilTest extends UsefulTestCase {
     assertMatches("*Git", "GitBlaBla");
     assertMatches("*git", "BlaGitBla");
     assertMatches("*Git", "BlaGitBla");
-    assertDoesntMatch("*Git", "BlagitBla");
+    assertFalse(firstLetterMatcher("*Git").matches("BlagitBla"));
     assertMatches("*git", "BlagitBla");
     assertMatches("*Git*", "AtpGenerationItem");
     assertMatches("Collec*Util*", "CollectionUtils");
diff --git a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
index 00b6db039de0..d48eb69989c7 100644
--- a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
+++ b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java
@@ -193,7 +193,7 @@ public class MinusculeMatcher implements Matcher {
       if (next < 0) {
         break;
       }
-      if (upper && next > 0 && !Character.isUpperCase(name.charAt(next))) {
+      if (upper && next > 0 && !Character.isUpperCase(name.charAt(next)) && myOptions != NameUtil.MatchingCaseSensitivity.NONE) {
         fromIndex = next + 1;
         continue;
       }