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

redundant cast inside conditional when opposite has another type

Browse Source
This commit is contained in:
Anna Kozlova
2016-06-06 17:52:24 +03:00
parent 9a5802d177
commit de94a3250f
7 changed files with 58 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/RedundantCastUtil.java
+3 -2
View File
@@ -60,7 +60,7 @@ public class RedundantCastUtil {
if (parent instanceof PsiExpressionList) parent = parent.getParent();
if (parent instanceof PsiReferenceExpression) parent = parent.getParent();
if (parent instanceof PsiAnonymousClass) parent = parent.getParent();
MyIsRedundantVisitor visitor = new MyIsRedundantVisitor(false);
MyIsRedundantVisitor visitor = new MyIsRedundantVisitor(true);
parent.accept(visitor);
return visitor.isRedundant;
}
@@ -537,7 +537,8 @@ public class RedundantCastUtil {
final PsiExpression thenExpression = ((PsiConditionalExpression)parent).getThenExpression();
final PsiExpression elseExpression = ((PsiConditionalExpression)parent).getElseExpression();
final PsiExpression opposite = thenExpression == typeCast ? elseExpression : thenExpression;
if (opposite == null || !Comparing.equal(conditionalType, opposite.getType())) return;
if (opposite == null || conditionalType instanceof PsiPrimitiveType &&
!Comparing.equal(conditionalType, opposite.getType())) return;
}
} else if (parent instanceof PsiSynchronizedStatement && (expr instanceof PsiExpression && ((PsiExpression)expr).getType() instanceof PsiPrimitiveType)) {
return;