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-31493 - IAE: ClsClassImpl.isInheritor

Browse Source
This commit is contained in:
anna
2011-12-27 19:55:57 +01:00
parent 22341c8055
commit 527ce9d6a1
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaVariableConflictResolver.java
+22 -20
View File
@@ -67,26 +67,28 @@ public class JavaVariableConflictResolver implements PsiConflictResolver{
final PsiElement scope = currentResult.getCurrentFileResolveScope();
Boolean oldClassIsInheritor = null;
if (newClass.isInheritor(oldClass, true)) {
if (!(scope instanceof PsiClass) ||
scope.equals(oldClass) ||
scope.equals(newClass) ||
!((PsiClass)scope).isInheritorDeep(oldClass, newClass)) {
// candidate is better
conflicts.remove(currentResult);
currentResult = candidate;
currentElement = currentResult.getElement();
continue;
if (newClass != null && oldClass != null) {
if (newClass.isInheritor(oldClass, true)) {
if (!(scope instanceof PsiClass) ||
scope.equals(oldClass) ||
scope.equals(newClass) ||
!((PsiClass)scope).isInheritorDeep(oldClass, newClass)) {
// candidate is better
conflicts.remove(currentResult);
currentResult = candidate;
currentElement = currentResult.getElement();
continue;
}
}
}
else if (oldClassIsInheritor = oldClass.isInheritor(newClass, true)) {
if (!(scope instanceof PsiClass) ||
scope.equals(oldClass) ||
scope.equals(newClass) ||
!((PsiClass)scope).isInheritorDeep(newClass, oldClass)) {
// candidate is worse
conflicts.remove(candidate);
continue;
else if (oldClassIsInheritor = oldClass.isInheritor(newClass, true)) {
if (!(scope instanceof PsiClass) ||
scope.equals(oldClass) ||
scope.equals(newClass) ||
!((PsiClass)scope).isInheritorDeep(newClass, oldClass)) {
// candidate is worse
conflicts.remove(candidate);
continue;
}
}
}
@@ -108,7 +110,7 @@ public class JavaVariableConflictResolver implements PsiConflictResolver{
}
if (oldClassIsInheritor == null) {
oldClassIsInheritor = oldClass.isInheritor(newClass, true);
oldClassIsInheritor = oldClass != null && newClass != null && oldClass.isInheritor(newClass, true);
}
if (oldClassIsInheritor) {
// both fields are accessible