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: better types for script variables

Browse Source
This commit is contained in:
Bas Leijdekkers
2016-03-26 15:37:58 +01:00
parent f1f01b78ec
commit 09f2422699
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java
+8 -2
View File
@@ -170,9 +170,15 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile {
@NotNull
@Override
public PsiElement getPresentableElement(PsiElement element) {
if (element instanceof PsiJavaCodeReferenceElement) {
if (element instanceof PsiReferenceExpression) {
final PsiElement parent = element.getParent();
if (parent instanceof PsiTypeElement) {
if (parent instanceof PsiMethodCallExpression) {
return parent;
}
}
else if (element instanceof PsiJavaCodeReferenceElement) {
final PsiElement parent = element.getParent();
if (parent instanceof PsiTypeElement || parent instanceof PsiNewExpression || parent instanceof PsiAnnotation) {
return parent;
}
}
platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchUtil.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class StructuralSearchUtil {
if (profile == null) {
return element;
}
return getParentIfIdentifier(profile.getPresentableElement(element));
return profile.getPresentableElement(getParentIfIdentifier(element));
}
private static StructuralSearchProfile[] getNewStyleProfiles() {
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralSearchTest.java
+9 -4
View File
@@ -1177,10 +1177,12 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
final String source2 = "class A {" +
" String s = new String();" +
" int m() {" +
" @SuppressWarnings(\"\") int m() {" +
" n();" +
" int i = 2+1;" +
" return i;" +
" }" +
" void n() {}" +
"}";
assertEquals("type of variables in script are as expected", 1,
findMatchesCount(source2,
@@ -1196,11 +1198,14 @@ public class StructuralSearchTest extends StructuralSearchTestCase {
"g instanceof PsiTypeElement &&" +
"h instanceof PsiLocalVariable &&" +
"i instanceof PsiPolyadicExpression &&" +
"j instanceof PsiReferenceExpression\n" +
"j instanceof PsiReferenceExpression &&" +
"k instanceof PsiMethodCallExpression &&" +
"l instanceof PsiAnnotation\n" +
"\")]" +
"class '_a {" +
" '_b '_c = '_d;" +
" '_e '_f() {" +
" '_b '_c = new '_d();" +
" @'_l '_e '_f() {" +
" '_k();" +
" '_g '_h = '_i;" +
" return '_j;" +
" }" +