From e3f8e0553479e23efe2884dc1c5cf768aa8298aa Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 12 May 2011 12:55:05 +0200 Subject: [PATCH] correct matching for final * in some cases --- .../util/src/com/intellij/psi/codeStyle/NameUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java index 0af1ceaa513d..d28c11119826 100644 --- a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java +++ b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java @@ -539,10 +539,12 @@ public class NameUtil { } // there's more in the pattern, but no more words if (nextStart == name.length()) { - if (patternIndex + i == myPattern.length - 1 && - ' ' == myPattern[patternIndex + i] && - (i == 1 && isWordStart(myPattern[patternIndex]) || i + nameIndex == name.length())) { - return FList.emptyList().prepend(TextRange.from(nameIndex, i)); + if (patternIndex + i == myPattern.length - 1) { + char last = myPattern[patternIndex + i]; + if (' ' == last && (i == 1 && isWordStart(myPattern[patternIndex]) || i + nameIndex == name.length()) || + '*' == last) { + return FList.emptyList().prepend(TextRange.from(nameIndex, i)); + } } return null;