guava type migration: method call chain process statically imported heads correctly

This commit is contained in:
Dmitry Batkovich
2015-10-16 14:12:05 +03:00
parent c7cd15b9e5
commit 2a34dc5df3
@@ -229,15 +229,12 @@ public class GuavaFluentIterableConversionRule extends BaseGuavaTypeConversionRu
if (qualifier instanceof PsiMethodCallExpression) {
current = (PsiMethodCallExpression)qualifier;
}
else if (qualifier instanceof PsiReferenceExpression) {
else if (method.hasModifierProperty(PsiModifier.STATIC)) {
if (!CHAIN_HEAD_METHODS.contains(methodName)) {
return null;
}
final PsiElement maybeClass = ((PsiReferenceExpression)qualifier).resolve();
if (!(maybeClass instanceof PsiClass)) {
return null;
}
if (!FLUENT_ITERABLE.equals(((PsiClass)maybeClass).getQualifiedName())) {
final PsiClass aClass = method.getContainingClass();
if (aClass == null || !FLUENT_ITERABLE.equals(aClass.getQualifiedName())) {
return null;
}
break;