parent instanceof GrAssertStatement ||
parent instanceof GrThrowStatement ||
parent instanceof GrSwitchStatement ||
- parent instanceof GrVariable) {
+ parent instanceof GrVariable ||
- parent instanceof GrReferenceExpression ||
+ parent instanceof GrWhileStatement) {
return true;
}
-
+ if (parent instanceof GrReferenceExpression) {
+ if (ResolveUtil.isClassReference(parent)) {
+ parent = parent.getParent();
+ }
+ if (parent instanceof GrReferenceExpression) {
+ PsiElement resolved = ((GrReferenceExpression)parent).resolve();
+ if (resolved instanceof PsiMember) {
+ PsiClass containingClass = ((PsiMember)resolved).getContainingClass();
+ return containingClass != null && CommonClassNames.JAVA_LANG_CLASS.equals(containingClass.getQualifiedName());
+ }
+ }
+ return true;
+ }
++
+ if (parent instanceof GrTraditionalForClause) {
+ GrTraditionalForClause forClause = (GrTraditionalForClause)parent;
+ return expr == forClause.getCondition();
+ }
++
return isReturnStatement(expr);
}