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

NPE

Browse Source 
(cherry picked from commit 4f8711f13c3a3ebb847d879c0347013397792e84)
This commit is contained in:
anna
2013-11-25 16:48:18 +01:00
parent 36587422ff
commit 114485f414
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/PsiPolyExpressionUtil.java
+3 -1
View File
@@ -144,6 +144,7 @@ public class PsiPolyExpressionUtil {
if (expr instanceof PsiParenthesizedExpression) {
return isBooleanOrNumeric(((PsiParenthesizedExpression)expr).getExpression());
}
if (expr == null) return null;
PsiType type = null;
if (expr instanceof PsiNewExpression || hasStandaloneForm(expr)) {
type = expr.getType();
@@ -160,7 +161,8 @@ public class PsiPolyExpressionUtil {
final PsiExpression elseExpression = ((PsiConditionalExpression)expr).getElseExpression();
final ConditionalKind thenKind = isBooleanOrNumeric(thenExpression);
final ConditionalKind elseKind = isBooleanOrNumeric(elseExpression);
if (thenKind == elseKind) return thenKind;
if (thenKind == elseKind || elseKind == null) return thenKind;
if (thenKind == null) return elseKind;
}
return null;
}