java: no need to check package prefix for annotations on ref adjustment

This commit is contained in:
Roman Shevchenko
2013-11-07 13:10:46 +01:00
parent ab262e2085
commit a5960af372
2 changed files with 7 additions and 3 deletions
@@ -133,8 +133,13 @@ public class JavaReferenceAdjuster implements ReferenceAdjuster {
PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element.getPsi();
PsiElement qualifier = ref.getQualifier();
if (qualifier instanceof PsiJavaCodeReferenceElement && PsiTreeUtil.getChildOfType(qualifier, PsiAnnotation.class) != null) {
return true;
if (qualifier instanceof PsiJavaCodeReferenceElement) {
if (((PsiJavaCodeReferenceElement)qualifier).resolve() instanceof PsiPackage) {
return false;
}
if (PsiTreeUtil.getChildOfType(qualifier, PsiAnnotation.class) != null) {
return true;
}
}
PsiModifierList modifierList = PsiImplUtil.findNeighbourModifierList(ref);
@@ -345,7 +345,6 @@ public class PsiImplUtil {
if (annotationType instanceof PsiClass) {
return findApplicableTarget((PsiClass)annotationType, types);
}
if (annotationType == null) return null;
}
}