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 
GitOrigin-RevId: cac6587190e100352e1302cfda0d3f09903724d6
This commit is contained in:
Anna Kozlova
2020-05-11 20:09:58 +00:00
committed by intellij-monorepo-bot
parent 623f6f42c6
commit b088cbd746
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/psi/util/RedundantCastUtil.java
+8 -3
View File
@@ -84,7 +84,7 @@ public class RedundantCastUtil {
}
}
private void addIfNarrowing(PsiTypeCastExpression castExpression, PsiType opType, PsiType expectedTypeByParent) {
private void addIfNarrowing(PsiTypeCastExpression castExpression, @NotNull PsiType opType, PsiType expectedTypeByParent) {
PsiTypeElement castElement = castExpression.getCastType();
if (castElement != null && TypeConversionUtil.isAssignable(castElement.getType(), opType, false) &&
(expectedTypeByParent == null || TypeConversionUtil.isAssignable(expectedTypeByParent, opType, false))) {
@@ -97,7 +97,10 @@ public class RedundantCastUtil {
if (expression instanceof PsiTypeCastExpression) {
PsiExpression operand = getInnerMostOperand(expression);
if (operand != null) {
addIfNarrowing((PsiTypeCastExpression)expression, operand.getType(), expectedTypeByParent);
PsiType opType = operand.getType();
if (opType != null) {
addIfNarrowing((PsiTypeCastExpression)expression, opType, expectedTypeByParent);
}
}
}
}
@@ -786,7 +789,9 @@ public class RedundantCastUtil {
return;
}
}
addIfNarrowing((PsiTypeCastExpression)switchVariable, opType, null);
if (opType != null) {
addIfNarrowing((PsiTypeCastExpression)switchVariable, opType, null);
}
}
}
}