use ExcludedFileIndex in ElementPresentationUtil

java/java-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java

@@ -18,9 +18,10 @@ package com.intellij.psi.impl;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.TestUtil;
 import com.intellij.compiler.CompilerConfiguration;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.roots.ExcludedFileIndex;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.Key;
@@ -94,7 +95,7 @@ public class ElementPresentationUtil implements PlatformIcons {
 
   public static boolean isExcluded(final VirtualFile vFile, final Project project) {
     return vFile != null
-           && ProjectRootManager.getInstance(project).getFileIndex().isInSource(vFile)
+           && ServiceManager.getService(project, ExcludedFileIndex.class).isInSource(vFile)
            && CompilerConfiguration.getInstance(project).isExcludedFromCompilation(vFile);
   }
 

platform/core-api/src/com/intellij/openapi/roots/ExcludedFileIndex.java

@@ -29,6 +29,7 @@ public abstract class ExcludedFileIndex {
   }
 
   public abstract boolean isInContent(VirtualFile file);
+  public abstract boolean isInSource(VirtualFile file);
   public abstract boolean isExcludedFile(VirtualFile file);
 
   /**

platform/lang-impl/src/com/intellij/openapi/vcs/impl/ProjectExcludedFileIndex.java

@@ -39,6 +39,11 @@ public class ProjectExcludedFileIndex extends ExcludedFileIndex {
     return myRootManager.getFileIndex().isInContent(file);
   }
 
+  @Override
+  public boolean isInSource(VirtualFile file) {
+    return myRootManager.getFileIndex().isInSource(file);
+  }
+
   public boolean isExcludedFile(final VirtualFile file) {
     return myRootManager.getFileIndex().isIgnored(file);
   }

platform/vcs-impl/src/com/intellij/openapi/vcs/impl/DefaultExcludedFileIndex.java

@@ -38,6 +38,11 @@ public class DefaultExcludedFileIndex extends ExcludedFileIndex {
     return VfsUtil.isAncestor(getBaseDir(), file, false);
   }
 
+  @Override
+  public boolean isInSource(VirtualFile file) {
+    return isInContent(file);
+  }
+
   public boolean isExcludedFile(final VirtualFile file) {
     return false;
   }