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

SSR: more lenient if statement matching

Browse Source
This commit is contained in:
Bas Leijdekkers
2015-02-23 19:50:09 +01:00
parent 11336b7a7b
commit 076f4e4551
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+2 -1
View File
@@ -1205,9 +1205,10 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
public void visitIfStatement(final PsiIfStatement if1) {
final PsiIfStatement if2 = (PsiIfStatement)myMatchingVisitor.getElement();
final PsiStatement elseBranch = if1.getElseBranch();
myMatchingVisitor.setResult(myMatchingVisitor.match(if1.getCondition(), if2.getCondition()) &&
compareBody(if1.getThenBranch(), if2.getThenBranch()) &&
compareBody(if1.getElseBranch(), if2.getElseBranch()));
(elseBranch == null || compareBody(elseBranch, if2.getElseBranch())));
}
@Override
platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/predicates/WithinPredicate.java
+5 -1
View File
@@ -4,6 +4,7 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.structuralsearch.MatchOptions;
import com.intellij.structuralsearch.MatchResult;
import com.intellij.structuralsearch.Matcher;
@@ -35,6 +36,9 @@ public class WithinPredicate extends AbstractStringBasedPredicate {
public boolean match(PsiElement node, PsiElement match, int start, int end, MatchContext context) {
final MatchResult result = matcher.isMatchedByDownUp(match, myMatchOptions);
return result != null;
if (result == null) {
return false;
}
return PsiTreeUtil.isAncestor(result.getMatch(), match, false);
}
}
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+12
View File
@@ -842,6 +842,18 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
"return !(x);";
String s10034 = "return ('a);";
assertEquals("Find statement with parenthesized expr",2,findMatchesCount(s10033,s10034));
String in = "if (true) {" +
" System.out.println();" +
"} else {" +
" System.out.println();" +
"}" +
"if (true) System.out.println();";
String pattern1 = "if ('_exp) { '_statement*; }";
assertEquals("Find if statement with else", 2, findMatchesCount(in, pattern1));
String pattern2 = "if ('_exp) { '_statement*; } else { '_statement2{0,0}; }";
assertEquals("Find if statement without else", 1, findMatchesCount(in, pattern2));
}
public void testSearchClass() {