Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 2 insertions, 2 deletions

diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexFacade.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexFacade.java
index 057f6b076070..0bb65c600083 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexFacade.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexFacade.java
@@ -66,7 +66,7 @@ public class ProjectFileIndexFacade extends FileIndexFacade {
 
   @Override
   public boolean isExcludedFile(@NotNull final VirtualFile file) {
-    return myFileIndex.isIgnored(file);
+    return myFileIndex.isExcluded(file);
   }
 
   @Nullable
@@ -83,7 +83,7 @@ public class ProjectFileIndexFacade extends FileIndexFacade {
     while (true) {
       if (childDir == null) return false;
       if (childDir.equals(baseDir)) return true;
-      if (myDirectoryIndex.getInfoForDirectory(childDir) == null) return false;
+      if (!myDirectoryIndex.getInfoForFile(childDir).isInProject()) return false;
       childDir = childDir.getParent();
     }
   }