From 871f5e4d9eb9236d4f658c36a192fc4d51bf67ce Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 31 Jul 2012 14:42:51 +0200 Subject: [PATCH] first letter shouldn't oblige to use humps everywhere --- .../testSrc/com/intellij/psi/util/NameUtilTest.java | 5 ++++- .../src/com/intellij/psi/codeStyle/MinusculeMatcher.java | 4 ++-- 2 files changed, 6 insertions(+), 3 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 57902dbd3a6a..92321195a8a3 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/psi/util/NameUtilTest.java @@ -228,7 +228,8 @@ public class NameUtilTest extends UsefulTestCase { public void testFileStructure() { assertDoesntMatch("hint", "height: int"); - assertDoesntMatch("Hint", "Height:int"); + assertMatches("Hint", "Height:int"); + assertDoesntMatch("Hint", "Height: int"); assertMatches("getColor", "getBackground(): Color"); assertMatches("get color", "getBackground(): Color"); @@ -344,6 +345,8 @@ public class NameUtilTest extends UsefulTestCase { assertMatches("WebLOgic", "WebLogic"); assertMatches("WEbLogic", "WebLogic"); assertDoesntMatch("WebLogic", "Webologic"); + + assertMatches("Wlo", "WebLogic"); } public void testFinalSpace() { diff --git a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java index 4c306a3b605b..495cdb7d34fc 100644 --- a/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java +++ b/platform/util/src/com/intellij/psi/codeStyle/MinusculeMatcher.java @@ -38,9 +38,9 @@ public class MinusculeMatcher implements Matcher { public MinusculeMatcher(String pattern, NameUtil.MatchingCaseSensitivity options) { myOptions = options; myPattern = StringUtil.trimEnd(pattern, "* ").toCharArray(); - for (int i = 0; i < myPattern.length; i++) { + for (int i = 1; i < myPattern.length; i++) { char c = myPattern[i]; - if (Character.isUpperCase(c) && (i > 0 || myOptions != FIRST_LETTER)) { + if (Character.isUpperCase(c)) { myHasHumps = true; return; }