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

functional interface check optimization

Browse Source
This commit is contained in:
Anna Kozlova
2014-12-12 19:28:53 +01:00
parent 124c957b7c
commit da553663ee
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
+18 -9
View File
@@ -150,18 +150,23 @@ public class LambdaUtil {
}
private static boolean overridesPublicObjectMethod(PsiMethod psiMethod) {
boolean overrideObject = false;
for (PsiMethod superMethod : psiMethod.findDeepestSuperMethods()) {
final PsiClass containingClass = superMethod.getContainingClass();
private static boolean overridesPublicObjectMethod(HierarchicalMethodSignature psiMethod) {
final List<HierarchicalMethodSignature> signatures = psiMethod.getSuperSignatures();
if (signatures.isEmpty()) {
final PsiMethod method = psiMethod.getMethod();
final PsiClass containingClass = method.getContainingClass();
if (containingClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) {
if (superMethod.hasModifierProperty(PsiModifier.PUBLIC)) {
overrideObject = true;
break;
if (method.hasModifierProperty(PsiModifier.PUBLIC)) {
return true;
}
}
}
return overrideObject;
for (HierarchicalMethodSignature superMethod : signatures) {
if (overridesPublicObjectMethod(superMethod)) {
return true;
}
}
return false;
}
private static MethodSignature getMethodSignature(PsiMethod method, PsiClass psiClass, PsiClass containingClass) {
@@ -212,7 +217,7 @@ public class LambdaUtil {
final PsiMethod psiMethod = signature.getMethod();
if (!psiMethod.hasModifierProperty(PsiModifier.ABSTRACT)) continue;
if (psiMethod.hasModifierProperty(PsiModifier.STATIC)) continue;
if (!overridesPublicObjectMethod(psiMethod)) {
if (!overridesPublicObjectMethod(signature)) {
methods.add(signature);
}
}
@@ -238,6 +243,10 @@ public class LambdaUtil {
@Nullable
private static PsiMethod getMethod(PsiClass psiClass, MethodSignature methodSignature) {
if (methodSignature instanceof MethodSignatureBackedByPsiMethod) {
return ((MethodSignatureBackedByPsiMethod)methodSignature).getMethod();
}
final PsiMethod[] methodsByName = psiClass.findMethodsByName(methodSignature.getName(), true);
for (PsiMethod psiMethod : methodsByName) {
if (MethodSignatureUtil