1 files changed, 9 insertions, 18 deletions
diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
index 2f5485d6deae..b1385686bc3a 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
@@ -149,12 +149,19 @@ public class DirectoryIndexImpl extends DirectoryIndex {
 
   @Override
   public DirectoryInfo getInfoForDirectory(@NotNull VirtualFile dir) {
+    DirectoryInfo info = getInfoForFile(dir);
+    return info.isInProject() ? info : null;
+  }
+
+  @NotNull
+  @Override
+  public DirectoryInfo getInfoForFile(@NotNull VirtualFile file) {
     checkAvailability();
     dispatchPendingEvents();
 
-    if (!(dir instanceof NewVirtualFile)) return null;
+    if (!(file instanceof NewVirtualFile)) return NonProjectDirectoryInfo.NOT_SUPPORTED_VIRTUAL_FILE_IMPLEMENTATION;
 
-    return getRootIndex().getInfoForDirectory(dir);
+    return getRootIndex().getInfoForFile(file);
   }
 
   @Override
@@ -167,22 +174,6 @@ public class DirectoryIndexImpl extends DirectoryIndex {
   }
 
   @Override
-  public boolean isProjectExcludeRoot(@NotNull VirtualFile dir) {
-    checkAvailability();
-    if (!(dir instanceof NewVirtualFile)) return false;
-
-    return getRootIndex().isProjectExcludeRoot(dir);
-  }
-
-  @Override
-  public boolean isModuleExcludeRoot(@NotNull VirtualFile dir) {
-    checkAvailability();
-    if (!(dir instanceof NewVirtualFile)) return false;
-
-    return getRootIndex().isModuleExcludeRoot(dir);
-  }
-
-  @Override
   public String getPackageName(@NotNull VirtualFile dir) {
     checkAvailability();
     if (!(dir instanceof NewVirtualFile)) return null;