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

explicit type -> diamond: don't walk up throw lambda with explicit type

Browse Source
This commit is contained in:
Anna Kozlova
2017-09-06 10:53:10 +03:00
parent 18d71a7378
commit c14959d04c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/PsiDiamondTypeUtil.java
+2 -3
View File
@@ -153,9 +153,8 @@ public class PsiDiamondTypeUtil {
typeElement = ((PsiVariable)gParent).getTypeElement();
}
else if (gParent instanceof PsiReturnStatement) {
PsiMethod method = PsiTreeUtil.getParentOfType(gParent, PsiMethod.class);
LOG.assertTrue(method != null);
typeElement = method.getReturnTypeElement();
PsiElement method = PsiTreeUtil.getParentOfType(gParent, PsiMethod.class, PsiLambdaExpression.class);
typeElement = method instanceof PsiMethod ? ((PsiMethod)method).getReturnTypeElement() : null;
}
return typeElement != null && PsiAugmentProvider.getInferredType(typeElement) != null;
}