From 6fa432b1a5df978ed0a884eee888ad6c4f1fea29 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 24 Mar 2011 18:09:23 +0100 Subject: [PATCH] respect the completion case sensitive first letter option back --- .../completion/JavaCompletionContributor.java | 15 +-------------- .../OnlyUppercaseClassesWhenNothingIsFound.java | 7 ------- .../completion/HeavyNormalCompletionTest.java | 7 ------- .../src/com/intellij/psi/codeStyle/NameUtil.java | 2 +- .../completion/GroovyCompletionContributor.java | 7 +------ 5 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 java/java-tests/testData/codeInsight/completion/normal/OnlyUppercaseClassesWhenNothingIsFound.java diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java index 555fdc4f4ecc..fcf92f5c8a61 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java @@ -15,7 +15,6 @@ */ package com.intellij.codeInsight.completion; -import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.TailType; import com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFix; import com.intellij.codeInsight.hint.ShowParameterInfoHandler; @@ -249,7 +248,6 @@ public class JavaCompletionContributor extends CompletionContributor { if (reference instanceof PsiJavaReference) { final ElementFilter filter = getReferenceFilter(position); if (filter != null) { - boolean showCapitalizedClasses = showCapitalizedClasses(result); final boolean isSwitchLabel = SWITCH_LABEL.accepts(position); final PsiFile originalFile = parameters.getOriginalFile(); for (LookupElement element : JavaCompletionUtil.processJavaReference(position, @@ -261,12 +259,6 @@ public class JavaCompletionContributor extends CompletionContributor { continue; } - if (!showCapitalizedClasses && - element.getObject() instanceof PsiClass && - StringUtil.isCapitalized(((PsiClass)element.getObject()).getName())) { - continue; - } - if (isSwitchLabel) { result.addElement(TailTypeDecorator.withTail(element, TailType.createSimpleTailType(':'))); } @@ -308,11 +300,6 @@ public class JavaCompletionContributor extends CompletionContributor { }); } - public static boolean showCapitalizedClasses(CompletionResultSet result) { - String prefix = result.getPrefixMatcher().getPrefix(); - return StringUtil.isEmpty(prefix) || StringUtil.isCapitalized(prefix) || CodeInsightSettings.getInstance().COMPLETION_CASE_SENSITIVE == CodeInsightSettings.NONE; - } - private static void addKeywords(CompletionParameters parameters, CompletionResultSet result) { PsiElement position = parameters.getPosition(); final Set lookupSet = new LinkedHashSet(); @@ -344,7 +331,7 @@ public class JavaCompletionContributor extends CompletionContributor { return false; } - return StringUtil.isCapitalized(result.getPrefixMatcher().getPrefix()); + return StringUtil.isNotEmpty(result.getPrefixMatcher().getPrefix()); } private static void completeAnnotationAttributeName(CompletionResultSet result, PsiElement insertedElement, diff --git a/java/java-tests/testData/codeInsight/completion/normal/OnlyUppercaseClassesWhenNothingIsFound.java b/java/java-tests/testData/codeInsight/completion/normal/OnlyUppercaseClassesWhenNothingIsFound.java deleted file mode 100644 index 89550af05178..000000000000 --- a/java/java-tests/testData/codeInsight/completion/normal/OnlyUppercaseClassesWhenNothingIsFound.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Foo { - - { - aa - } - -} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java index bd093ca219a1..76192e23e425 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavyNormalCompletionTest.java @@ -48,13 +48,6 @@ public class HeavyNormalCompletionTest extends CompletionTestCase{ checkResultByFile("/codeInsight/completion/normal/" + getTestName(false) + "_after.java"); } - public void testOnlyUppercaseClassesWhenNothingIsFound() throws Throwable { - createClass("package foo.bar; public class aaaxBxCxDxEx {}"); - - configureByFile("/codeInsight/completion/normal/" + getTestName(false) + ".java"); - checkResultByFile("/codeInsight/completion/normal/" + getTestName(false) + ".java"); - } - public void testAllClassesOnSecondBasicCompletion() throws Throwable { createClass("package foo.bar; public class AxBxCxDxEx {}"); diff --git a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java index af407dd2b031..5d9283210452 100644 --- a/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java +++ b/platform/util/src/com/intellij/psi/codeStyle/NameUtil.java @@ -379,7 +379,7 @@ public class NameUtil { } public static Matcher buildCompletionMatcher(String pattern, int exactPrefixLen, boolean allowToUpper, boolean allowToLower) { - return buildMatcher(pattern, buildRegexp(pattern, exactPrefixLen, allowToUpper, allowToLower, false, true), false); + return buildMatcher(pattern, buildRegexp(pattern, exactPrefixLen, allowToUpper, allowToLower, false, true), exactPrefixLen > 0); } public static Matcher buildMatcher(String pattern, int exactPrefixLen, boolean allowToUpper, boolean allowToLower) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java index 60c6b7a58362..0721d3e3b227 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java @@ -362,7 +362,6 @@ public class GroovyCompletionContributor extends CompletionContributor { final ElementFilter classFilter = getClassFilter(position); - final boolean showCapitalizedClasses = JavaCompletionContributor.showCapitalizedClasses(result); reference.processVariants(new Consumer() { public void consume(Object element) { if (element instanceof PsiClass && inheritors.alreadyProcessed((PsiClass)element)) { @@ -384,10 +383,6 @@ public class GroovyCompletionContributor extends CompletionContributor { object = ((GroovyResolveResult)object).getElement(); } - if (!showCapitalizedClasses && object instanceof PsiClass && StringUtil.isCapitalized(((PsiClass)object).getName())) { - return; - } - final boolean autopopup = parameters.getInvocationCount() == 0; //skip default groovy methods if (!secondCompletionInvoked && @@ -458,7 +453,7 @@ public class GroovyCompletionContributor extends CompletionContributor { } }); - if (StringUtil.isCapitalized(prefix)) { + if (StringUtil.isNotEmpty(result.getPrefixMatcher().getPrefix())) { addAllClasses(parameters, result, inheritors); } }