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: lenient matching if element is not present in pattern

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-05-25 21:00:57 +02:00
parent 5d4451e360
commit 007e9e7ce4
3 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+4 -30
View File
@@ -196,7 +196,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
myMatchingVisitor.setResult(myMatchingVisitor.handleTypedElement(psiDocTagValue, tag2.getValueElement()));
}
else {
myMatchingVisitor.setResult(allowsAbsenceOfMatch(psiDocTagValue));
myMatchingVisitor.setResult(myMatchingVisitor.allowsAbsenceOfMatch(psiDocTagValue));
}
}
}
@@ -213,16 +213,6 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
}
}
private boolean allowsAbsenceOfMatch(final PsiElement element) {
MatchingHandler handler = myMatchingVisitor.getMatchContext().getPattern().getHandler(element);
if (handler instanceof SubstitutionHandler &&
((SubstitutionHandler)handler).getMinOccurs() == 0) {
return true;
}
return false;
}
@Override
public void visitDocComment(final PsiDocComment comment) {
PsiDocComment comment2;
@@ -311,16 +301,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
final PsiNameValuePair elementNameValuePair = (PsiNameValuePair)myMatchingVisitor.getElement();
final PsiAnnotationMemberValue annotationInitializer = pair.getValue();
if (annotationInitializer != null) {
final boolean isTypedInitializer = myMatchingVisitor.getMatchContext().getPattern().isTypedVar(annotationInitializer) &&
annotationInitializer instanceof PsiReferenceExpression;
myMatchingVisitor.setResult(myMatchingVisitor.match(annotationInitializer, elementNameValuePair.getValue()) ||
(isTypedInitializer &&
elementNameValuePair.getValue() == null &&
allowsAbsenceOfMatch(annotationInitializer)
));
}
myMatchingVisitor.setResult(myMatchingVisitor.match(annotationInitializer, elementNameValuePair.getValue()));
if (myMatchingVisitor.getResult()) {
final PsiIdentifier nameIdentifier = pair.getNameIdentifier();
final PsiIdentifier otherIdentifier = elementNameValuePair.getNameIdentifier();
@@ -976,9 +957,6 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
final PsiIdentifier nameIdentifier = var.getNameIdentifier();
boolean isTypedVar = myMatchingVisitor.getMatchContext().getPattern().isTypedVar(nameIdentifier);
boolean isTypedInitializer = var.getInitializer() != null &&
myMatchingVisitor.getMatchContext().getPattern().isTypedVar(var.getInitializer()) &&
var.getInitializer() instanceof PsiReferenceExpression;
final PsiVariable var2 = (PsiVariable)myMatchingVisitor.getElement();
try {
@@ -998,13 +976,9 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
if (myMatchingVisitor.getResult()) {
// Check initializer
final PsiExpression initializer = var.getInitializer();
final PsiExpression var2Initializer = var2.getInitializer();
myMatchingVisitor.setResult(myMatchingVisitor.match(var.getInitializer(), var2Initializer) ||
(isTypedInitializer &&
var2Initializer == null &&
allowsAbsenceOfMatch(var.getInitializer())
));
myMatchingVisitor.setResult(myMatchingVisitor.match(initializer, var2Initializer));
}
if (myMatchingVisitor.getResult() && var instanceof PsiParameter && var.getParent() instanceof PsiCatchSection) {