From 9392dc01829956bcfa5c644f6233d61c19cd8b9b Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 29 Oct 2012 17:23:06 +0100
Subject: [PATCH] EA-40404 - NPE:
 MagicCompletionContributor.fillCompletionVariants

---
 .../magicConstant/MagicCompletionContributor.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java
index efc77798a5d0..2a82958eb202 100644
--- a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java
+++ b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicCompletionContributor.java
@@ -68,8 +68,8 @@ public class MagicCompletionContributor extends CompletionContributor {
         PsiMethod method = (PsiMethod)element;
         if (!resolveHelper.isAccessible(method, call, null)) continue;
         PsiElement argument = pos;
-        while (!(argument.getParent() instanceof PsiExpressionList)) argument = argument.getParent();
-        PsiExpressionList list = (PsiExpressionList)argument.getParent();
+        while (!(argument.getContext() instanceof PsiExpressionList)) argument = argument.getContext();
+        PsiExpressionList list = (PsiExpressionList)argument.getContext();
         int i = ArrayUtil.indexOf(list.getExpressions(), argument);
         if (i == -1) continue;
         PsiParameter[] params = method.getParameterList().getParameters();