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: Java string literal should not match char fix

Browse Source
This commit is contained in:
Bas Leijdekkers
2018-11-07 21:07:57 +01:00
parent 671dd1ad2a
commit c8a468a100
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+11 -13
View File
@@ -1090,23 +1090,21 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
public void visitLiteralExpression(final PsiLiteralExpression const1) {
final PsiLiteralExpression const2 = getExpression(PsiLiteralExpression.class);
if (const2 == null) return;
final PsiType type1 = const1.getType();
if (type1 != null && !myMatchingVisitor.setResult(type1.equals(const2.getType()))) {
return;
}
final MatchingHandler handler = (MatchingHandler)const1.getUserData(CompiledPattern.HANDLER_KEY);
if (handler instanceof SubstitutionHandler) {
final PsiType type1 = const1.getType();
if (type1 != null && !type1.equals(const2.getType())) {
myMatchingVisitor.setResult(false);
}
else {
int offset = 0;
int length = const2.getTextLength();
final String text = const2.getText();
int offset = 0;
int length = const2.getTextLength();
final String text = const2.getText();
if (StringUtil.isQuotedString(text)) {
length--;
offset++;
}
myMatchingVisitor.setResult(((SubstitutionHandler)handler).handle(const2, offset, length, myMatchingVisitor.getMatchContext()));
if (StringUtil.isQuotedString(text)) {
length--;
offset++;
}
myMatchingVisitor.setResult(((SubstitutionHandler)handler).handle(const2, offset, length, myMatchingVisitor.getMatchContext()));
}
else if (handler != null) {
myMatchingVisitor.setResult(handler.match(const1, const2, myMatchingVisitor.getMatchContext()));
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+1
View File
@@ -282,6 +282,7 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
"}";
assertEquals("match literal by value", 1, findMatchesCount(s3, "32"));
assertEquals("match char with substitution", 3, findMatchesCount(s3, "\\''_x\\'"));
assertEquals("string literal should not match char", 0, findMatchesCount(s3, "\"a\""));
}
public void testCovariantArraySearch() {