inspection view: use uast to determine container for jvm langs (fix tests)

This commit is contained in:
Dmitry Batkovich
2018-12-12 13:11:11 +03:00
parent b3efe3ab0d
commit 7b1f29c5b9
@@ -49,7 +49,7 @@ public class RefJavaManagerImpl extends RefJavaManager {
Conditions.or(Conditions.instanceOf(PsiFile.class, PsiJavaModule.class),
Conditions.and(Conditions.notInstanceOf(PsiTypeParameter.class), psi -> {
UDeclaration decl = UastContextKt.toUElement(psi, UDeclaration.class);
return decl != null && (!(decl instanceof UField) || !(decl instanceof UVariable)) && (!(decl instanceof UClassInitializer));
return decl != null && (decl instanceof UField || !(decl instanceof UVariable)) && (!(decl instanceof UClassInitializer));
}));
private static final Logger LOG = Logger.getInstance(RefJavaManagerImpl.class);
@@ -291,7 +291,9 @@ public class RefJavaManagerImpl extends RefJavaManager {
@Nullable
@Override
public PsiNamedElement getElementContainer(@NotNull PsiElement psiElement) {
return (PsiNamedElement)PsiTreeUtil.findFirstParent(psiElement, PROBLEM_ELEMENT_CONDITION);
PsiNamedElement cont = (PsiNamedElement)PsiTreeUtil.findFirstParent(psiElement, PROBLEM_ELEMENT_CONDITION);
System.out.println(cont);
return cont;
}
@Override