error resolving import

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);
     }

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);
   }