MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 15:27:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Alexey Kudravtsev
2009-10-29 12:18:21 +03:00
parent 54004f9c21
commit 18839484a5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
+10 -1
View File
@@ -106,6 +106,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
if (!myClassName.equals(name)) {
return true;
}
boolean accessible = myPlace == null || checkAccessibility(aClass);
if (myCandidates == null) {
myCandidates = new SmartList<ClassCandidateInfo>();
}
@@ -126,6 +127,15 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
return true;
}
boolean infoAccessible = info.isAccessible();
if (infoAccessible && !accessible) {
return true;
}
if (!infoAccessible && accessible) {
myCandidates.remove(i);
continue;
}
// single import wins over on-demand
boolean myOnDemand = isOnDemand(myCurrentFileContext, aClass);
boolean otherOnDemand = isOnDemand(info.getCurrentFileResolveScope(), otherClass);
@@ -137,7 +147,6 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
}
}
boolean accessible = myPlace == null || checkAccessibility(aClass);
myHasAccessibleCandidate |= accessible;
myHasInaccessibleCandidate |= !accessible;
myCandidates.add(new ClassCandidateInfo(aClass, state.get(PsiSubstitutor.KEY), !accessible, myCurrentFileContext));