From cfaf7ece7a119a5518227e7c0738bfa7ba5dfeaa Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 6 Nov 2009 15:18:20 +0300
Subject: [PATCH] error resolving import

---
 .../codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java | 2 +-
 .../psi/impl/source/resolve/ClassResolverProcessor.java        | 3 ++-
 .../com/intellij/psi/impl/source/resolve/FileContextUtil.java  | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
index 88ca6d57f87d..a9b2b9bd3ae3 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
@@ -687,7 +687,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
   }
 
   @Override public void visitReferenceElement(PsiJavaCodeReferenceElement ref) {
-    JavaResolveResult result = null;
+    JavaResolveResult result;
     try {
       result = ref.advancedResolve(true);
     }
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
index 383341ad1453..ff5fdaa291f9 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
@@ -102,7 +102,8 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
     if ("java.lang".equals(packageName)) return true;
 
     // class from my package imported implicitly
-    PsiFile file = myPlace == null ? null : myPlace.getContainingFile();
+    PsiFile file = myPlace == null ? null : FileContextUtil.getContextFile(myPlace);
+    
     return file instanceof PsiJavaFile && ((PsiJavaFile)file).getPackageName().equals(packageName);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/FileContextUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/FileContextUtil.java
index 18563570d9af..a5da52c6d624 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/FileContextUtil.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/FileContextUtil.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.SmartPsiElementPointer;
+import org.jetbrains.annotations.NotNull;
 
 public class FileContextUtil {
   public static final Key<SmartPsiElementPointer> INJECTED_IN_ELEMENT = Key.create("injectedIn");
@@ -32,7 +33,7 @@ public class FileContextUtil {
     return pointer == null ? null : pointer.getElement();
   }
 
-  public static PsiFile getContextFile(PsiElement element){
+  public static PsiFile getContextFile(@NotNull PsiElement element){
     if (!element.isValid()) return null;
     PsiFile file = element.getContainingFile();
     if (file == null) return null;