MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

moreSpecific conflicts resolve (IDEA-111085)

Browse Source
This commit is contained in:
anna
2013-07-26 16:53:43 +02:00
parent b31f5f8ced
commit b55834ea6e
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java
View File

@@ -626,6 +626,8 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
}
private static Specifics chooseHigherDimension(PsiType type1, PsiType type2) {
if (type1 != null && type1.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) return null;
if (type2 != null && type2.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) return null;
int d1 = type1 != null ? type1.getArrayDimensions() : 0;
int d2 = type2 != null ? type2.getArrayDimensions() : 0;
if (d1 > d2) {