From 0a54cefed1acdaf9d560aab8e2b334c72ffd413d Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Wed, 25 Jul 2012 13:27:40 +0200
Subject: [PATCH] correctly calculate relative path for packages

---
 .../src/com/intellij/core/CoreJavaFileManager.java           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
index b6fcf28e23c9..41dda61bab85 100644
--- a/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
+++ b/java/java-psi-impl/src/com/intellij/core/CoreJavaFileManager.java
@@ -75,8 +75,9 @@ public class CoreJavaFileManager implements JavaFileManager {
     final VirtualFile file = dir.getVirtualFile();
     for (VirtualFile root : myClasspath) {
       if (VfsUtilCore.isAncestor(root, file, false)) {
-        final String relativePath = FileUtil.getRelativePath(root.getPath(), file.getPath(), '.');
-        return new PsiPackageImpl(myPsiManager, relativePath);
+        String relativePath = FileUtil.getRelativePath(root.getPath(), file.getPath(), '/');
+        if (relativePath == null) continue;
+        return new PsiPackageImpl(myPsiManager, relativePath.replace('/', '.'));
       }
     }
     return null;