diff options
Diffstat (limited to 'java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java')
-rw-r--r-- | java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java b/java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java index d4382b40db7a..ccb606d51376 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/RedundantCastUtil.java @@ -541,8 +541,17 @@ public class RedundantCastUtil { } } } - if (parent instanceof PsiInstanceOfExpression || (TypeConversionUtil.isAssignable(castTo, opType, false) && - (expectedTypeByParent == null || TypeConversionUtil.isAssignable(expectedTypeByParent, opType, false)))) { + if (parent instanceof PsiInstanceOfExpression) { + //15.20.2. Type Comparison Operator instanceof: + //If a cast (ยง15.16) of the RelationalExpression to the ReferenceType would be rejected as a compile-time error, + //then the instanceof relational expression likewise produces a compile-time error. + final PsiTypeElement checkTypeElement = ((PsiInstanceOfExpression)parent).getCheckType(); + if (checkTypeElement != null && TypeConversionUtil.areTypesConvertible(opType, checkTypeElement.getType())) { + addToResults(typeCast); + } + } + else if (TypeConversionUtil.isAssignable(castTo, opType, false) && + (expectedTypeByParent == null || TypeConversionUtil.isAssignable(expectedTypeByParent, opType, false))) { addToResults(typeCast); } } |