MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

normal methods should have higher priority than Collections.emptyList

Browse Source
This commit is contained in:
peter
2012-03-09 20:39:06 +04:00
parent 14cd4a02fc
commit d796ecea55
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java
+7 -2
View File
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.completion.scope.JavaCompletionProcessor;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementWeigher;
import com.intellij.psi.*;
import com.intellij.psi.filters.getters.MembersGetter;
import com.intellij.psi.util.PropertyUtil;
import org.jetbrains.annotations.NotNull;
@@ -44,8 +45,9 @@ public class PreferLocalVariablesLiteralsAndAnnoMethodsWeigher extends LookupEle
qualifiedWithField,
qualifiedWithGetter,
superMethodParameters,
collectionFactory,
normal,
collectionFactory,
expectedTypeMember,
nonInitialized,
classLiteral,
className,
@@ -75,7 +77,10 @@ public class PreferLocalVariablesLiteralsAndAnnoMethodsWeigher extends LookupEle
if (item.getUserData(CollectionsUtilityMethodsProvider.COLLECTION_FACTORY) != null) {
return MyResult.collectionFactory;
}
if (Boolean.TRUE.equals(item.getUserData(MembersGetter.EXPECTED_TYPE_INHERITOR_MEMBER))) {
return MyResult.expectedTypeMember;
}
final JavaChainLookupElement chain = item.as(JavaChainLookupElement.CLASS_CONDITION_KEY);
if (chain != null) {
Object qualifier = chain.getQualifier().getObject();
java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java
+6 -3
View File
@@ -22,6 +22,7 @@ import com.intellij.codeInsight.completion.StaticMemberProcessor;
import com.intellij.codeInsight.lookup.AutoCompletionPolicy;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Key;
import com.intellij.psi.*;
import com.intellij.psi.filters.TrueFilter;
import com.intellij.psi.scope.processor.FilterScopeProcessor;
@@ -43,6 +44,7 @@ import java.util.Set;
* @author peter
*/
public abstract class MembersGetter {
public static final Key<Boolean> EXPECTED_TYPE_INHERITOR_MEMBER = Key.create("EXPECTED_TYPE_INHERITOR_MEMBER");
public void processMembers(@NotNull final PsiElement context, final Consumer<LookupElement> results, @Nullable final PsiClass where,
final boolean acceptMethods, boolean searchInheritors,
@@ -85,7 +87,7 @@ public abstract class MembersGetter {
final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(context.getProject()).getResolveHelper();
PsiClassType baseType = JavaPsiFacade.getElementFactory(where.getProject()).createType(where);
final PsiClassType baseType = JavaPsiFacade.getElementFactory(where.getProject()).createType(where);
Consumer<PsiType> consumer = new Consumer<PsiType>() {
@Override
public void consume(PsiType psiType) {
@@ -97,7 +99,7 @@ public abstract class MembersGetter {
return;
}
}
processClassDeclaredMembers(psiClass, context, acceptMethods, results, resolveHelper, importedStatically);
processClassDeclaredMembers(psiClass, context, acceptMethods, results, resolveHelper, importedStatically, psiType != baseType);
}
}
};
@@ -110,7 +112,7 @@ public abstract class MembersGetter {
private void processClassDeclaredMembers(PsiClass where,
PsiElement context,
boolean acceptMethods,
Consumer<LookupElement> results, final PsiResolveHelper resolveHelper, final Set<PsiMember> importedStatically) {
Consumer<LookupElement> results, final PsiResolveHelper resolveHelper, final Set<PsiMember> importedStatically, boolean isInheritor) {
final FilterScopeProcessor<PsiElement> processor = new FilterScopeProcessor<PsiElement>(TrueFilter.INSTANCE);
where.processDeclarations(processor, ResolveState.initial(), null, context);
@@ -123,6 +125,7 @@ public abstract class MembersGetter {
if (result instanceof PsiMethod && acceptMethods) continue;
final LookupElement item = result instanceof PsiMethod ? createMethodElement((PsiMethod)result) : createFieldElement((PsiField)result);
if (item != null) {
item.putUserData(EXPECTED_TYPE_INHERITOR_MEMBER, isInheritor);
results.consume(AutoCompletionPolicy.NEVER_AUTOCOMPLETE.applyPolicy(item));
}
}