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: fix CCE on inverted java comment variable

Browse Source
This commit is contained in:
Bas Leijdekkers
2018-02-02 16:21:03 +01:00
parent 414ba48af5
commit 841a097dc5
2 changed files with 4 additions and 5 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
+1 -5
View File
@@ -119,7 +119,7 @@ public class JavaCompilingVisitor extends JavaRecursiveElementWalkingVisitor {
for (PsiClass aClass : classes) {
if (includeSelf) {
final String name = aClass.getName();
if (name != null) result.add(name);;
if (name != null) result.add(name);
}
ClassInheritorsSearch.search(aClass, projectAndLibraries, true).forEach(c -> {
final String name = c.getName();
@@ -177,10 +177,6 @@ public class JavaCompilingVisitor extends JavaRecursiveElementWalkingVisitor {
throw new MalformedPatternException();
}
if (handler.getPredicate() != null) {
((RegExpPredicate)handler.getPredicate()).setMultiline(true);
}
RegExpPredicate predicate = handler.findRegExpPredicate();
if (GlobalCompilingVisitor.isSuitablePredicate(predicate, handler)) {
myCompilingVisitor.processTokenizedName(predicate.getRegExp(), true, GlobalCompilingVisitor.OccurenceKind.COMMENT);
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+3
View File
@@ -1385,6 +1385,9 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
assertEquals("Comment matching", 3, findMatchesCount(s1, "// 'Comment:[regex( .*(?:comment).* )]"));
assertEquals("Comment matching, 2", 3, findMatchesCount(s1, "/* 'Comment:[regex( .*(?:comment).* )] */"));
assertEquals("Java doc matching", 1, findMatchesCount(s1, "/** 'Comment:[regex( .*(?:comment).* )] */"));
assertEquals("Comment matching with negate", 2, findMatchesCount(s1, "// 'not_comment:[!regex( .*(?:comment).* )]"));
assertEquals("Multi line", 1, findMatchesCount(s1, "//'_comment:[regex( .*another.* )]"));
assertEquals("Multi line negated", 4, findMatchesCount(s1, "//'_comment:[!regex( .*another.* )]"));
String s4 = "class X {{ java.util.Arrays.asList(\"'test\", \"another test\", \"garbage\"); }}";
assertEquals("Literal content", 2, findMatchesCount(s4, "\"'test:[regex( .*test.* )]\""));