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: allow to match classes, interfaces and enums with a single query

Browse Source
This commit is contained in:
Bas Leijdekkers
2017-10-15 11:40:59 +02:00
parent 5cb86d17d3
commit 61b27afb44
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java
+6 -1
View File
@@ -84,7 +84,12 @@ class JavaPredefinedConfigurations {
),
createSearchTemplateInfo(
SSRBundle.message("predefined.configuration.classes"),
"class 'Class {}",
"class 'Class:[script( \"!__context__.interface && !__context__.enum\" )] {}",
CLASS_TYPE
),
createSearchTemplateInfo(
SSRBundle.message("predefined.configuration.classes.interfaces.enums"),
"class 'ClassInterfaceEnum {}",
CLASS_TYPE
),
createSearchTemplateInfo(
java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java
+1 -1
View File
@@ -470,7 +470,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor {
boolean result = false;
try {
final boolean templateIsInterface = clazz.isInterface();
if (templateIsInterface != clazz2.isInterface()) return false;
if (templateIsInterface && !clazz2.isInterface()) return false;
if (templateIsInterface && clazz.isAnnotationType() && !clazz2.isAnnotationType()) return false;
if (clazz.isEnum() && !clazz2.isEnum()) return false;
if (clazz instanceof PsiTypeParameter != clazz2 instanceof PsiTypeParameter) return false;
platform/structuralsearch/source/messages/SSRBundle.properties
+1
View File
@@ -146,6 +146,7 @@ predefined.configuration.all.fields.of.the.class=all fields of the class
predefined.configuration.instance.fields.of.the.class=instance fields of the class
predefined.configuration.packagelocal.fields.of.the.class=package-private fields of the class
predefined.configuration.classes=classes
predefined.configuration.classes.interfaces.enums=classes, interfaces & enums
predefined.configuration.new.expressions=new expressions
predefined.configuration.lambdas=lambdas
predefined.configuration.method.references=method references
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+9 -3
View File
@@ -1278,10 +1278,16 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
final String s105 = "class B {} class A extends B { } class C {} class D extends C {}";
assertEquals("extends match", 1, findMatchesCount(s105, "class '_ extends '_:[ref( \"class B {}\" )] {}"));
final String s107 = "interface IA {} interface IB extends IA { } interface IC extends IB {} interface ID extends IC {}" +
"class A implements IA {} class B extends A { } class C extends B implements IC {} class D extends C {}";
final String s107 = "interface IA {}" +
"interface IB extends IA {}" +
"interface IC extends IB {} " +
"interface ID extends IC {}" +
"class A implements IA {}" +
"class B extends A {}" +
"class C extends B implements IC {}" +
"class D extends C {}";
assertEquals("extends navigation match", 2, findMatchesCount(s107, "class '_ extends 'Type:+A {}"));
assertEquals("implements navigation match", 3, findMatchesCount(s107, "class '_ implements 'Type:+IA {}"));
assertEquals("implements navigation match", 5, findMatchesCount(s107, "class '_ implements 'Type:+IA {}"));
final String s109 = "interface I {}" +
"interface I2 extends I {}" +