From ec76f6982419a07028fa8fb424fe51f408218c58 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 28 Dec 2011 13:32:38 +0100
Subject: [PATCH] EA-32493 - UOE:
 AopPointcutExpressionFindUsagesProvider.getDescriptiveName

---
 .../com/intellij/refactoring/util/ConflictsUtil.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/util/ConflictsUtil.java b/java/java-impl/src/com/intellij/refactoring/util/ConflictsUtil.java
index 902ae2547824..0ae871c7447f 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/ConflictsUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/ConflictsUtil.java
@@ -21,6 +21,7 @@
 package com.intellij.refactoring.util;
 
 import com.intellij.psi.*;
+import com.intellij.psi.impl.source.resolve.FileContextUtil;
 import com.intellij.psi.util.PsiFormatUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.RefactoringBundle;
@@ -37,9 +38,16 @@ public class ConflictsUtil {
   public static PsiElement getContainer(PsiElement place) {
     PsiElement parent = place;
     while (true) {
-      if (parent instanceof PsiMember && !(parent instanceof PsiTypeParameter))
+      if (parent instanceof PsiMember && !(parent instanceof PsiTypeParameter)) {
         return parent;
-      if (parent instanceof PsiFile) return parent;
+      }
+      if (parent instanceof PsiFile) {
+        PsiElement host = FileContextUtil.getFileContext((PsiFile)parent);
+        if (host == null) {
+          return parent;
+        }
+        parent = host;
+      }
       parent = parent.getParent();
     }
   }