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

method refs: simplify

Browse Source
This commit is contained in:
Anna Kozlova
2016-02-01 16:53:20 +03:00
parent 6fb3647245
commit b82907366b
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
+5 -10
View File
@@ -104,12 +104,10 @@ public class PsiMethodReferenceUtil {
final PsiElement resolve = result.getElement();
if (resolve instanceof PsiMethod) {
containingClass = ((PsiMethod)resolve).getContainingClass();
PsiType returnType = PsiTypesUtil.patchMethodGetClassReturnType(expression, expression, (PsiMethod)resolve, null, PsiUtil.getLanguageLevel(expression));
if (returnType == null) {
returnType = ((PsiMethod)resolve).getReturnType();
if (PsiType.VOID.equals(returnType)) {
methodReturnType = PsiTypesUtil.patchMethodGetClassReturnType(expression, expression, (PsiMethod)resolve, null, PsiUtil.getLanguageLevel(expression));
if (methodReturnType == null) {
methodReturnType = ((PsiMethod)resolve).getReturnType();
if (PsiType.VOID.equals(methodReturnType)) {
return false;
}
@@ -120,14 +118,11 @@ public class PsiMethodReferenceUtil {
LOG.assertTrue(subst != null);
}
methodReturnType = subst.substitute(returnType);
methodReturnType = subst.substitute(methodReturnType);
if (methodReturnType != null) {
methodReturnType = PsiUtil.captureToplevelWildcards(methodReturnType, expression);
}
}
else {
methodReturnType = returnType;
}
}
else if (resolve instanceof PsiClass) {
if (resolve == JavaPsiFacade.getElementFactory(expression.getProject()).getArrayClass(PsiUtil.getLanguageLevel(resolve))) {