diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java index 3c4f2a887d7f..229d0a15096a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java @@ -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; } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java index 3ff53364450f..690a0c5a8877 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java @@ -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(); }