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

EA-55041 - IAE: TypeConversionUtil.isAssignable

Browse Source
This commit is contained in:
Anna Kozlova
2014-04-04 14:49:50 +02:00
parent 9de341b401
commit dd5324046c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
+2 -2
View File
@@ -402,7 +402,7 @@ public final class Match {
final PsiMethod replacedMethod = PsiTreeUtil.getParentOfType(parent, PsiMethod.class);
LOG.assertTrue(replacedMethod != null);
final PsiType replacedMethodReturnType = replacedMethod.getReturnType();
if (weakerType(psiMethod, returnType, replacedMethodReturnType)) {
if (replacedMethodReturnType != null && weakerType(psiMethod, returnType, replacedMethodReturnType)) {
return replacedMethodReturnType;
}
}
@@ -411,7 +411,7 @@ public final class Match {
return null;
}
private static boolean weakerType(final PsiMethod psiMethod, final PsiType returnType, final PsiType currentType) {
private static boolean weakerType(final PsiMethod psiMethod, final PsiType returnType, @NotNull final PsiType currentType) {
final PsiTypeParameter[] typeParameters = psiMethod.getTypeParameters();
final PsiSubstitutor substitutor =
JavaPsiFacade.getInstance(psiMethod.getProject()).getResolveHelper().inferTypeArguments(typeParameters, new PsiType[]{returnType}, new PsiType[]{currentType}, PsiUtil.getLanguageLevel(psiMethod));