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

Groovy: static checking

Browse Source
This commit is contained in:
Max Medvedev
2014-06-18 14:02:39 +04:00
parent 2fb712e2d7
commit e1e345c1b3
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/untypedUnresolvedAccess/GrUnresolvedAccessChecker.java
+1 -1
View File
@@ -146,7 +146,7 @@ public class GrUnresolvedAccessChecker {
if (refElement.getParent() instanceof GrNewExpression) {
boolean inStaticContext = GrStaticChecker.isInStaticContext(refElement, null);
boolean inStaticContext = GrStaticChecker.isInStaticContext(refElement);
if (!inStaticContext && GrUnresolvedAccessInspection.isSuppressed(refElement)) return null;
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrStaticChecker.java
+7 -6
View File
@@ -191,16 +191,16 @@ public class GrStaticChecker {
public static boolean isInStaticContext(@NotNull PsiElement place) {
PsiClass targetClass = null;
if (place instanceof GrReferenceExpression) {
PsiElement qualifier = ((GrReferenceExpression)place).getQualifier();
if (PsiUtil.isThisReference(place) && qualifier instanceof GrReferenceExpression) {
targetClass = (PsiClass)((GrReferenceExpression)qualifier).resolve();
PsiElement qualifier = ((GrQualifiedReference)place).getQualifier();
if (PsiUtil.isThisReference(place) && qualifier instanceof GrQualifiedReference) {
targetClass = (PsiClass)((GrQualifiedReference)qualifier).resolve();
}
}
return isInStaticContext(place, targetClass);
}
public static boolean isInStaticContext(@NotNull PsiElement place, @Nullable PsiClass targetClass) {
if (place instanceof GrQualifiedReference) {
if (place instanceof GrReferenceExpression) {
GrQualifiedReference reference = (GrQualifiedReference)place;
PsiElement qualifier = reference.getQualifier();
if (qualifier != null && !PsiUtil.isThisOrSuperRef(reference)) {
@@ -210,7 +210,7 @@ public class GrStaticChecker {
else if (PsiUtil.isThisReference(qualifier)) { //instance 'this' already is processed. So it static 'this'
return true;
}
return qualifier instanceof GrReferenceExpression && ((GrReferenceExpression)qualifier).resolve() instanceof PsiClass;
return qualifier instanceof GrQualifiedReference && ((GrQualifiedReference)qualifier).resolve() instanceof PsiClass;
}
@@ -221,6 +221,7 @@ public class GrStaticChecker {
PsiElement run = place;
while (run != null && run != targetClass) {
if (targetClass == null && run instanceof PsiClass) return false;
if (run instanceof GrClosableBlock) return false;
if (run instanceof PsiModifierListOwner && ((PsiModifierListOwner)run).hasModifierProperty(PsiModifier.STATIC)) return true;
run = run.getParent();
}
@@ -228,7 +229,7 @@ public class GrStaticChecker {
}
public static boolean isPropertyAccessInStaticMethod(@NotNull GrReferenceExpression referenceExpression) {
return isInStaticContext(referenceExpression, null) &&
return isInStaticContext(referenceExpression) &&
!(referenceExpression.getParent() instanceof GrMethodCall) &&
referenceExpression.getQualifier() == null;
}