From 8d44b61a55e71cbce0b03f3c8c44995ea24e97c7 Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 30 Nov 2012 12:04:44 +0100 Subject: [PATCH] cast conversion java 7 (IDEA-96213) [Roma] (cherry picked from commit d433089be2856a9c3ae05c10daeeb12736d13023) --- .../src/com/intellij/psi/util/TypeConversionUtil.java | 4 ++-- .../advHighlighting7/PolymorphicTypeCast.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java index dbfc77322661..45efd2b53250 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java @@ -115,8 +115,8 @@ public class TypeConversionUtil { final PsiClass psiClass = classType.resolve(); if (psiClass == null || psiClass instanceof PsiTypeParameter) return false; final PsiClassType boxedType = ((PsiPrimitiveType)toType).getBoxedType(psiClass.getManager(), psiClass.getResolveScope()); - if (boxedType != null) { - return isAssignable(fromType, boxedType); + if (boxedType != null && isAssignable(fromType, boxedType)) { + return true; } } return fromTypeRank == toTypeRank || diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/PolymorphicTypeCast.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/PolymorphicTypeCast.java index c967a7328b62..8be16fc1db85 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/PolymorphicTypeCast.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/PolymorphicTypeCast.java @@ -90,4 +90,8 @@ class C { } void m(int i) { } + + void asLongs(Integer i) { + long l = (long) i; + } } \ No newline at end of file