MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

register functional interfaces from guava, trove, common collections

Browse Source
This commit is contained in:
Anna Kozlova
2014-12-12 19:28:54 +01:00
parent da553663ee
commit c138ff43f1
1 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/FunctionalInterfaceSuggester.java
+47 -7
View File
@@ -33,6 +33,37 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class FunctionalInterfaceSuggester {
public static final String[] FUNCTIONAL_INTERFACES = {
//old jdk without annotations
CommonClassNames.JAVA_LANG_RUNNABLE,
CommonClassNames.JAVA_UTIL_CONCURRENT_CALLABLE,
CommonClassNames.JAVA_UTIL_COMPARATOR,
//IDEA
"com.intellij.util.Function",
"com.intellij.util.Consumer",
"com.intellij.openapi.util.Computable",
"com.intellij.openapi.util.Condition",
"com.intellij.util.Processor",
"com.intellij.util.Producer",
//guava
"com.google.common.base.Function",
"com.google.common.base.Predicate",
"com.google.common.base.Supplier",
//common collections
"org.apache.commons.collections.Closure",
"org.apache.commons.collections.Factory",
"org.apache.commons.collections.Predicate",
"org.apache.commons.collections.Transformer",
//trove
"gnu.trove.TObjectFunction",
"gnu.trove.TObjectProcedure",
"gnu.trove.TObjectObjectProcedure",
};
public static Collection<? extends PsiType> suggestFunctionalInterfaces(final @NotNull PsiFunctionalExpression expression) {
final PsiType qualifierType = expression instanceof PsiMethodReferenceExpression
? PsiMethodReferenceUtil.getQualifierType((PsiMethodReferenceExpression)expression) : null;
@@ -113,13 +144,8 @@ public class FunctionalInterfaceSuggester {
private static <T extends PsiElement> Collection<? extends PsiType> suggestFunctionalInterfaces(final @NotNull T element, final NullableFunction<PsiClass, PsiType> acceptanceChecker) {
final Project project = element.getProject();
final PsiClass functionalInterfaceClass = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_LANG_FUNCTIONAL_INTERFACE,
GlobalSearchScope.allScope(project));
if (functionalInterfaceClass == null) {
return Collections.emptyList();
}
final Set<PsiType> types = new HashSet<PsiType>();
AnnotatedMembersSearch.search(functionalInterfaceClass, element.getResolveScope()).forEach(new Processor<PsiMember>() {
final Processor<PsiMember> consumer = new Processor<PsiMember>() {
@Override
public boolean process(PsiMember member) {
if (member instanceof PsiClass && !Java15APIUsageInspectionBase.isForbiddenApiUsage(member, PsiUtil.getLanguageLevel(element))) {
@@ -130,7 +156,21 @@ public class FunctionalInterfaceSuggester {
}
return true;
}
});
};
final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
final GlobalSearchScope allScope = GlobalSearchScope.allScope(project);
final PsiClass functionalInterfaceClass = psiFacade.findClass(CommonClassNames.JAVA_LANG_FUNCTIONAL_INTERFACE, allScope);
if (functionalInterfaceClass != null) {
AnnotatedMembersSearch.search(functionalInterfaceClass, element.getResolveScope()).forEach(consumer);
}
for (String functionalInterface : FUNCTIONAL_INTERFACES) {
final PsiClass aClass = psiFacade.findClass(functionalInterface, allScope);
if (aClass != null) {
consumer.process(aClass);
}
}
final ArrayList<PsiType> typesToSuggest = new ArrayList<PsiType>(types);
Collections.sort(typesToSuggest, new Comparator<PsiType>() {
@Override