From 94cbf2fd2a62a4589787b69c35b34a08691f6cd2 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 16 Nov 2015 10:51:42 +0100 Subject: [PATCH] expected type by parent: parameter rename --- .../src/com/intellij/psi/util/PsiTypesUtil.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java index bd5e4d45ba85..94e335a6031a 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java @@ -186,15 +186,15 @@ public class PsiTypesUtil { } @Nullable - public static PsiType getExpectedTypeByParent(PsiElement methodCall) { - final PsiElement parent = PsiUtil.skipParenthesizedExprUp(methodCall.getParent()); + public static PsiType getExpectedTypeByParent(PsiElement element) { + final PsiElement parent = PsiUtil.skipParenthesizedExprUp(element.getParent()); if (parent instanceof PsiVariable) { - if (PsiUtil.checkSameExpression(methodCall, ((PsiVariable)parent).getInitializer())) { + if (PsiUtil.checkSameExpression(element, ((PsiVariable)parent).getInitializer())) { return ((PsiVariable)parent).getType(); } } else if (parent instanceof PsiAssignmentExpression) { - if (PsiUtil.checkSameExpression(methodCall, ((PsiAssignmentExpression)parent).getRExpression())) { + if (PsiUtil.checkSameExpression(element, ((PsiAssignmentExpression)parent).getRExpression())) { return ((PsiAssignmentExpression)parent).getLExpression().getType(); } } @@ -207,7 +207,7 @@ public class PsiTypesUtil { return ((PsiMethod)psiElement).getReturnType(); } } - else if (PsiUtil.isCondition(methodCall, parent)) { + else if (PsiUtil.isCondition(element, parent)) { return PsiType.BOOLEAN.getBoxedType(parent); } else if (parent instanceof PsiArrayInitializerExpression) {