skip parenthesis exprs

This commit is contained in:
anna
2012-11-15 21:37:06 +01:00
parent 3987b4bbb2
commit 6f21decc3d
2 changed files with 3 additions and 3 deletions
@@ -95,7 +95,7 @@ public class StaticImportMethodFix implements IntentionAction {
private PsiType getExpectedType() {
final PsiMethodCallExpression methodCall = myMethodCall.getElement();
if (methodCall == null) return null;
final PsiElement parent = methodCall.getParent();
final PsiElement parent = PsiResolveHelperImpl.skipParenthesizedExprUp(methodCall.getParent());
if (parent instanceof PsiVariable) {
if (methodCall.equals(PsiResolveHelperImpl.skipParenthesizedExprDown(((PsiVariable)parent).getInitializer()))) {
@@ -126,7 +126,7 @@ public class StaticImportMethodFix implements IntentionAction {
final PsiElement psiElement = resolveResult.getElement();
if (psiElement instanceof PsiMethod) {
final PsiParameter[] parameters = ((PsiMethod)psiElement).getParameterList().getParameters();
final int idx = ArrayUtilRt.find(((PsiExpressionList)parent).getExpressions(), methodCall);
final int idx = ArrayUtilRt.find(((PsiExpressionList)parent).getExpressions(), PsiResolveHelperImpl.skipParenthesizedExprUp(methodCall));
return idx > -1 ? resolveResult.getSubstitutor().substitute(parameters[idx].getType()) : null;
}
}
@@ -1054,7 +1054,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
return initializer;
}
private static PsiElement skipParenthesizedExprUp(PsiElement parent) {
public static PsiElement skipParenthesizedExprUp(PsiElement parent) {
while (parent instanceof PsiParenthesizedExpression) {
parent = parent.getParent();
}