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

hacky re-fix JavaResolveUtil.isAccessible()

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-20 12:55:29 +02:00
parent 2c25a5a901
commit c70887a17e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java
+7 -2
View File
@@ -73,7 +73,7 @@ public class JavaResolveUtil {
if (visibility == JavaCodeFragment.VisibilityChecker.Visibility.NOT_VISIBLE) return false;
}
}
else if (placeFile != null && !(placeFile instanceof PsiClassOwner) && !PsiImplUtil.isInServerPage(placeFile)) return true;
else if (isAllSeeingPlace(placeFile)) return true;
// We don't care about access rights in javadoc
if (isInJavaDoc(place)) return true;
@@ -85,7 +85,7 @@ public class JavaResolveUtil {
int effectiveAccessLevel = PsiUtil.getAccessLevel(modifierList);
PsiFile file = placeFile == null ? null : FileContextUtil.getContextFile(placeFile); //TODO: implementation method!!!!
if (PsiImplUtil.isInServerPage(file) && PsiImplUtil.isInServerPage(member.getContainingFile())) return true;
if (placeFile != null && !(placeFile instanceof PsiClassOwner) && !PsiImplUtil.isInServerPage(file)) return true;
if (isAllSeeingPlace(file)) return true;
if (effectiveAccessLevel == PsiUtil.ACCESS_LEVEL_PUBLIC) {
return true;
}
@@ -142,6 +142,11 @@ public class JavaResolveUtil {
return true;
}
private static boolean isAllSeeingPlace(PsiFile placeFile) {
// TODO HACK introduce a special API here, don't use FileResolveScopeProvider (which just happens to be implemented by correct files)
return placeFile instanceof FileResolveScopeProvider && !PsiImplUtil.isInServerPage(placeFile);
}
public static boolean isInJavaDoc(final PsiElement place) {
PsiElement scope = place;
while(scope != null){