MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

SSR: matching for annotated type casts

Browse Source
This commit is contained in:
Bas Leijdekkers
2014-12-29 13:26:42 +01:00
parent 9194da8039
commit 42980624be
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+10 -1
View File
@@ -1521,7 +1521,16 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
@Override
public void visitTypeElement(final PsiTypeElement typeElement) {
myMatchingVisitor.setResult(matchType(typeElement, myMatchingVisitor.getElement()));
final PsiElement other = myMatchingVisitor.getElement(); // might not be a PsiTypeElement
final PsiAnnotation[] annotations = PsiTreeUtil.getChildrenOfType(typeElement, PsiAnnotation.class);
// also can't use AnnotationOwner api because it is not implemented completely yet (see e.g. ClsTypeParameterImpl)
final PsiAnnotation[] annotations2 = PsiTreeUtil.getChildrenOfType(other, PsiAnnotation.class);
if (annotations != null) {
myMatchingVisitor.setResult(annotations2 != null && myMatchingVisitor.matchInAnyOrder(annotations, annotations2));
if (!myMatchingVisitor.getResult()) return;
}
myMatchingVisitor.setResult(matchType(typeElement, other));
}
@Override