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 finding packageLocal and instance fields

Browse Source
This commit is contained in:
Bas Leijdekkers
2016-03-05 11:46:17 +01:00
parent b7d1eec045
commit 876932b1bb
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+14 -27
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -103,11 +103,6 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
}
}
private static boolean isNotInstanceModifier(final PsiModifierList list2) {
return list2.hasModifierProperty(PsiModifier.STATIC) ||
list2.hasModifierProperty(PsiModifier.ABSTRACT);
}
@Override
public final void visitModifierList(final PsiModifierList list) {
final PsiModifierList list2 = (PsiModifierList)myMatchingVisitor.getElement();
@@ -138,17 +133,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
boolean matchedOne = false;
for (PsiAnnotationMemberValue v : ((PsiArrayInitializerMemberValue)value).getInitializers()) {
@PsiModifier.ModifierConstant String name = StringUtil.stripQuotesAroundValue(v.getText());
if (MatchOptions.INSTANCE_MODIFIER_NAME.equals(name)) {
if (isNotInstanceModifier(list2)) {
myMatchingVisitor.setResult(false);
return;
}
else {
matchedOne = true;
}
}
else if (list2.hasModifierProperty(name)) {
if (annotationValueMatchesModifierList(list2, v)) {
matchedOne = true;
break;
}
@@ -160,14 +145,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
}
}
else {
@PsiModifier.ModifierConstant String name = StringUtil.stripQuotesAroundValue(value.getText());
if (MatchOptions.INSTANCE_MODIFIER_NAME.equals(name)) {
if (isNotInstanceModifier(list2)) {
myMatchingVisitor.setResult(false);
return;
}
}
else if (!list2.hasModifierProperty(name)) {
if (!annotationValueMatchesModifierList(list2, value)) {
myMatchingVisitor.setResult(false);
return;
}
@@ -178,14 +156,23 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
}
}
myMatchingVisitor.setResult(set.isEmpty() || myMatchingVisitor
.matchInAnyOrder(set.toArray(new PsiAnnotation[set.size()]), list2.getAnnotations()));
myMatchingVisitor.setResult(set.isEmpty() ||
myMatchingVisitor.matchInAnyOrder(set.toArray(new PsiAnnotation[set.size()]), list2.getAnnotations()));
}
else {
myMatchingVisitor.setResult(true);
}
}
private static boolean annotationValueMatchesModifierList(PsiModifierList list2, PsiAnnotationMemberValue value) {
@PsiModifier.ModifierConstant final String name = StringUtil.unquoteString(value.getText());
if (MatchOptions.INSTANCE_MODIFIER_NAME.equals(name)) {
return !list2.hasModifierProperty(PsiModifier.STATIC) && !list2.hasModifierProperty(PsiModifier.ABSTRACT) &&
list2.getParent() instanceof PsiMember;
}
return list2.hasModifierProperty(name) && (!PsiModifier.PACKAGE_LOCAL.equals(name) || list2.getParent() instanceof PsiMember);
}
@Override
public void visitDocTag(final PsiDocTag tag) {
final PsiDocTag tag2 = (PsiDocTag)myMatchingVisitor.getElement();
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+12
View File
@@ -3415,4 +3415,16 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
assertEquals("find with simple method pattern 2", 1, findMatchesCount(source, "void one();"));
assertEquals("find with simple static initializer pattern", 3, findMatchesCount(source, "static { '_statement*;}"));
}
public void testFindPackageLocalAndInstanceFields() {
String source = "class X {" +
" final int var1;" +
" void a(final int var2) {" +
" final int var3;" +
" }" +
"}";
assertEquals("parameters and local variables are not package local", 1, findMatchesCount(source, "@Modifier(\"packageLocal\") '_T '_a;"));
assertEquals("any variable can be final", 3, findMatchesCount(source, "@Modifier(\"final\") '_T '_a;"));
assertEquals("parameters and local variables are not instance fields", 1, findMatchesCount(source, "@Modifier(\"Instance\") '_T '_a;"));
}
}