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

PsiTypesUtil: reverted erroneous changes in getExpectedTypeByParent (IDEA-CR-15590)

Browse Source
This commit is contained in:
Tagir Valeev
2016-11-11 17:19:40 +07:00
parent d7485f0574
commit ec55819285
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
+8 -2
View File
@@ -211,7 +211,13 @@ public class PsiTypesUtil {
}
}
else if (parent instanceof PsiReturnStatement) {
return getMethodReturnType(parent);
final PsiElement psiElement = PsiTreeUtil.getParentOfType(parent, PsiLambdaExpression.class, PsiMethod.class);
if (psiElement instanceof PsiLambdaExpression) {
return null;
}
else if (psiElement instanceof PsiMethod){
return ((PsiMethod)psiElement).getReturnType();
}
}
else if (PsiUtil.isCondition(element, parent)) {
return PsiType.BOOLEAN.getBoxedType(parent);
@@ -231,7 +237,7 @@ public class PsiTypesUtil {
}
}
else if (gParent instanceof PsiArrayInitializerExpression) {
final PsiType expectedTypeByParent = getExpectedTypeByParent((PsiExpression)parent);
final PsiType expectedTypeByParent = getExpectedTypeByParent(parent);
return expectedTypeByParent != null && expectedTypeByParent instanceof PsiArrayType
? ((PsiArrayType)expectedTypeByParent).getComponentType() : null;
}