1 files changed, 14 insertions, 2 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 5cc3a8a9ca92..e699383321ae 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -132,7 +132,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
 
     myBackgroundableActionHandlerMap = new EnumMap<VcsBackgroundableActions, BackgroundableActionEnabledHandler>(VcsBackgroundableActions.class);
     myInitialization = new VcsInitialization(myProject);
-    myMappings = new NewMappings(myProject, myMessageBus, this, manager, excludedFileIndex);
+    myMappings = new NewMappings(myProject, myMessageBus, this, manager);
     myMappingsToRoots = new MappingsToRoots(myMappings, myProject);
 
     if (!myProject.isDefault()) {
@@ -843,12 +843,24 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
       @Override
       public Boolean compute() {
         return vf != null && (myExcludedIndex.isInContent(vf) || isFileInBaseDir(vf) || vf.equals(myProject.getBaseDir()) ||
-                              hasExplicitMapping(vf) || isInDirectoryBasedRoot(vf)) && !myExcludedIndex.isExcludedFile(vf);
+                              hasExplicitMapping(vf) || isInDirectoryBasedRoot(vf)
+                              || !Registry.is("ide.hide.excluded.files") && myExcludedIndex.isExcludedFile(vf))
+               && !isIgnored(vf);
       }
     });
   }
 
   @Override
+  public boolean isIgnored(VirtualFile vf) {
+    if (Registry.is("ide.hide.excluded.files")) {
+      return myExcludedIndex.isExcludedFile(vf);
+    }
+    else {
+      return myExcludedIndex.isUnderIgnored(vf);
+    }
+  }
+
+  @Override
   public boolean dvcsUsedInProject() {
     AbstractVcs[] allActiveVcss = getAllActiveVcss();
     for (AbstractVcs activeVcs : allActiveVcss) {