1 files changed, 2 insertions, 15 deletions
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java
index 565bb432bad7..746e227fdf82 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/FileIndexBase.java
@@ -5,7 +5,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.FileIndex;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author nik
@@ -19,21 +18,9 @@ public abstract class FileIndexBase implements FileIndex {
     myFileTypeRegistry = fileTypeManager;
   }
 
-  @Nullable
+  @NotNull
   protected DirectoryInfo getInfoForFileOrDirectory(@NotNull VirtualFile file) {
-    if (!file.isDirectory() && file.getParent() == null) return null; // e.g. LightVirtualFile in test
-    DirectoryInfo info = myDirectoryIndex.getInfoForDirectory(file);
-    if (info != null) {
-      return info;
-    }
-
-    if (!file.isDirectory() && !myDirectoryIndex.isModuleExcludeRoot(file)) {
-      VirtualFile dir = file.getParent();
-      if (dir != null) {
-        return myDirectoryIndex.getInfoForDirectory(dir);
-      }
-    }
-    return null;
+    return myDirectoryIndex.getInfoForFile(file);
   }
 
   @Override