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

IDEA-130071 (SSR incorrectly says pattern does not match anything in selected scope)

Browse Source
This commit is contained in:
Bas Leijdekkers
2014-12-18 20:27:09 +01:00
parent 2562fcf408
commit cabfec01e9
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/compiler/JavaCompilingVisitor.java
+25 -1
View File
@@ -436,7 +436,31 @@ public class JavaCompilingVisitor extends JavaRecursiveElementWalkingVisitor {
private void handleReference(PsiJavaCodeReferenceElement reference) {
handleReferenceText(reference.getReferenceName(), myCompilingVisitor.getContext());
if (shouldOccur(reference)) {
handleReferenceText(reference.getReferenceName(), myCompilingVisitor.getContext());
}
}
private boolean shouldOccur(PsiJavaCodeReferenceElement reference) {
final CompileContext compileContext = myCompilingVisitor.getContext();
final PsiElement parent = reference.getParent();
if (!(parent instanceof PsiReferenceList)) {
return true;
}
final PsiElement grandParent = parent.getParent();
if (!(grandParent instanceof PsiMethod)) {
return true;
}
final PsiMethod method = (PsiMethod)grandParent;
if (method.getThrowsList() != parent) {
return true;
}
final String name = method.getName();
if (!compileContext.getPattern().isTypedVar(name)) {
return true;
}
final SubstitutionHandler handler = (SubstitutionHandler)compileContext.getPattern().getHandler(name);
return !(handler != null && handler.getMinOccurs() == 0);
}
private static void handleReferenceText(String refname, CompileContext compileContext) {