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

do not mark as conflict static methods from different (inherited) classes by default

Browse Source
This commit is contained in:
anna
2012-04-09 15:14:49 +02:00
parent 1806e9f6aa
commit 923f9b22ce
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
+6 -4
View File
@@ -329,6 +329,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
return checkSubtyping(type1, type2, method1, method2, true);
}
@Nullable
private static Specifics checkSubtyping(PsiType type1,
PsiType type2,
PsiMethod method1,
@@ -336,9 +337,10 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
boolean boxingHappening) {
boolean noBoxing = boxingHappening || type1 instanceof PsiPrimitiveType == type2 instanceof PsiPrimitiveType;
final boolean allowUncheckedConversion =
!method1.hasModifierProperty(PsiModifier.STATIC) && !method2.hasModifierProperty(PsiModifier.STATIC);
final boolean assignable2From1 = noBoxing && TypeConversionUtil.isAssignable(type2, type1, allowUncheckedConversion || InheritanceUtil.isInheritorOrSelf(method1.getContainingClass(), method2.getContainingClass(), true));
final boolean assignable1From2 = noBoxing && TypeConversionUtil.isAssignable(type1, type2, allowUncheckedConversion || InheritanceUtil.isInheritorOrSelf(method2.getContainingClass(), method1.getContainingClass(), true));
!method1.hasModifierProperty(PsiModifier.STATIC) && !method2.hasModifierProperty(PsiModifier.STATIC) ||
method1.getContainingClass() == method2.getContainingClass();
final boolean assignable2From1 = noBoxing && TypeConversionUtil.isAssignable(type2, type1, allowUncheckedConversion);
final boolean assignable1From2 = noBoxing && TypeConversionUtil.isAssignable(type1, type2, allowUncheckedConversion);
if (assignable1From2 || assignable2From1) {
if (assignable1From2 && assignable2From1) {
return null;
@@ -347,7 +349,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
return assignable1From2 ? Specifics.SECOND : Specifics.FIRST;
}
return Specifics.NEITHER;
return allowUncheckedConversion ? Specifics.NEITHER : null;
}
private boolean isBoxingHappened(PsiType argType, PsiType parameterType) {