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

IDEADEV-40049

Browse Source
This commit is contained in:
Alexey Kudravtsev
2009-09-04 16:55:45 +04:00
parent 9fd3aa02bf
commit bec083b1b4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
+3 -2
View File
@@ -246,8 +246,9 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
}
private static Specifics checkSubtyping(PsiType type1, PsiType type2) {
final boolean assignable2From1 = TypeConversionUtil.isAssignable(type2, type1, false);
final boolean assignable1From2 = TypeConversionUtil.isAssignable(type1, type2, false);
boolean noBoxing = type1 instanceof PsiPrimitiveType == type2 instanceof PsiPrimitiveType;
final boolean assignable2From1 = noBoxing && TypeConversionUtil.isAssignable(type2, type1, false);
final boolean assignable1From2 = noBoxing && TypeConversionUtil.isAssignable(type1, type2, false);
if (assignable1From2 || assignable2From1) {
if (assignable1From2 && assignable2From1) {
return null;