Moved TypeUtils#getMethodReturnType -> PsiTypesUtil; used in LambdaUtil#getFunctionalInterfaceType amd PsiTypesUtil#getExpectedTypeByParent (IDEA-CR-15590)

This commit is contained in:
Tagir Valeev
2016-11-11 10:23:15 +07:00
parent 793a8df8d0
commit 67c4dfb483
11 changed files with 32 additions and 50 deletions
@@ -22,7 +22,6 @@ import com.intellij.refactoring.typeMigration.TypeConversionDescriptor;
import com.intellij.refactoring.typeMigration.TypeEvaluator;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import com.siyeh.ig.psiutils.TypeUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -64,7 +63,7 @@ public class GuavaTypeConversionDescriptor extends TypeConversionDescriptor {
return isIterable(((PsiLocalVariable)parent).getType());
}
else if (parent instanceof PsiReturnStatement) {
return isIterable(TypeUtils.getMethodReturnType(parent));
return isIterable(PsiTypesUtil.getMethodReturnType(parent));
}
else if (parent instanceof PsiExpressionList) {
final PsiExpressionList expressionList = (PsiExpressionList)parent;