From 721e54981a8b5306064e5e891aa6495b179a8092 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 21 Jun 2012 21:05:05 +0200 Subject: [PATCH] @NotNull matcher --- .../intellij/codeInsight/completion/JavaCompletionUtil.java | 4 ++-- .../completion/JavaSmartCompletionContributor.java | 2 +- .../ReferenceExpressionCompletionContributor.java | 4 ++-- .../codeInsight/completion/StaticMemberProcessor.java | 6 +++--- .../src/com/intellij/psi/filters/getters/MembersGetter.java | 3 ++- .../groovy/lang/completion/GroovyCompletionContributor.java | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index cd91b1a1d50f..04243dab1710 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -416,9 +416,9 @@ public class JavaCompletionUtil { } public static Set processJavaReference(PsiElement element, PsiJavaReference javaReference, ElementFilter elementFilter, - final boolean checkAccess, boolean filterStaticAfterInstance, @Nullable final PrefixMatcher matcher, CompletionParameters parameters) { + final boolean checkAccess, boolean filterStaticAfterInstance, final PrefixMatcher matcher, CompletionParameters parameters) { final THashSet set = new THashSet(); - final Condition nameCondition = matcher == null ? null : new Condition() { + final Condition nameCondition = new Condition() { public boolean value(String s) { return matcher.prefixMatches(s); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java index ec24f053c783..fc292da6fb7d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java @@ -388,7 +388,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor { final ElementFilter filter, final boolean acceptClasses, final boolean acceptMembers, - CompletionParameters parameters, @Nullable final PrefixMatcher matcher) { + CompletionParameters parameters, final PrefixMatcher matcher) { if (reference instanceof PsiMultiReference) { reference = ContainerUtil.findInstance(((PsiMultiReference) reference).getReferences(), PsiJavaReference.class); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java index b164555b8576..d64e68ced8dc 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java @@ -138,7 +138,7 @@ public class ReferenceExpressionCompletionContributor { final boolean secondTime = parameters.getParameters().getInvocationCount() >= 2; final Set base = - JavaSmartCompletionContributor.completeReference(element, reference, filter, false, true, parameters.getParameters(), null); + JavaSmartCompletionContributor.completeReference(element, reference, filter, false, true, parameters.getParameters(), PrefixMatcher.ALWAYS_TRUE); for (final LookupElement item : new LinkedHashSet(base)) { ExpressionLookupItem access = getSingleArrayElementAccess(element, item); if (access != null) { @@ -200,7 +200,7 @@ public class ReferenceExpressionCompletionContributor { public boolean isClassAcceptable(Class hintClass) { return true; } - }), false, true, parameters.getParameters(), null); + }), false, true, parameters.getParameters(), PrefixMatcher.ALWAYS_TRUE); for (LookupElement lookupElement : elements) { if (lookupElement.getObject() instanceof PsiMethod) { final JavaMethodCallElement item = lookupElement.as(JavaMethodCallElement.CLASS_CONDITION_KEY); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java index 753615e2b0d7..212561c4bc7b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java @@ -122,18 +122,18 @@ public abstract class StaticMemberProcessor { } } - public List processMembersOfRegisteredClasses(@Nullable final PrefixMatcher matcher, PairConsumer consumer) { + public List processMembersOfRegisteredClasses(final PrefixMatcher matcher, PairConsumer consumer) { final ArrayList result = CollectionFactory.arrayList(); for (final PsiClass psiClass : myStaticImportedClasses) { for (final PsiMethod method : psiClass.getAllMethods()) { - if (matcher == null || matcher.prefixMatches(method.getName())) { + if (matcher.prefixMatches(method.getName())) { if (isStaticallyImportable(method)) { consumer.consume(method, psiClass); } } } for (final PsiField field : psiClass.getAllFields()) { - if (matcher == null || matcher.prefixMatches(field. getName())) { + if (matcher.prefixMatches(field. getName())) { if (isStaticallyImportable(field)) { consumer.consume(field, psiClass); } diff --git a/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java index 8923ff7ba34a..6c2ad8706f2a 100644 --- a/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java +++ b/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java @@ -18,6 +18,7 @@ package com.intellij.psi.filters.getters; import com.intellij.codeInsight.CodeInsightUtil; import com.intellij.codeInsight.completion.CompletionUtil; import com.intellij.codeInsight.completion.JavaCompletionUtil; +import com.intellij.codeInsight.completion.PrefixMatcher; import com.intellij.codeInsight.completion.StaticMemberProcessor; import com.intellij.codeInsight.lookup.AutoCompletionPolicy; import com.intellij.codeInsight.lookup.LookupElement; @@ -61,7 +62,7 @@ public abstract class MembersGetter { } final Set importedStatically = new HashSet(); - processor.processMembersOfRegisteredClasses(null, new PairConsumer() { + processor.processMembersOfRegisteredClasses(PrefixMatcher.ALWAYS_TRUE, new PairConsumer() { @Override public void consume(PsiMember member, PsiClass psiClass) { importedStatically.add(member); 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 6ee0109519cd..50a61e334e7e 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 @@ -498,7 +498,7 @@ public class GroovyCompletionContributor extends CompletionContributor { }); if (qualifier == null) { - completeStaticMembers(parameters).processMembersOfRegisteredClasses(null, new PairConsumer() { + completeStaticMembers(parameters).processMembersOfRegisteredClasses(PrefixMatcher.ALWAYS_TRUE, new PairConsumer() { @Override public void consume(PsiMember member, PsiClass psiClass) { if (member instanceof GrAccessorMethod) {