summaryrefslogtreecommitdiff
path: root/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2014-08-20 17:01:23 -0700
committerTor Norbye <tnorbye@google.com>2014-08-20 17:01:23 -0700
commit1aa2e09bdbd413eacb677e9fa4b50630530d0656 (patch)
tree2f4cc6d69645bd460aa253fdecb606d764fbd25d /platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java
parent02cf98d65c798d368fcec43ed64a001d513bdd4f (diff)
downloadidea-1aa2e09bdbd413eacb677e9fa4b50630530d0656.tar.gz
Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git
Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
Diffstat (limited to 'platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java')
-rw-r--r--platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java
index 5c2adcbccd8d..1e1cbdf55f5f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsPathPresenter.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vcs.FilePath;
import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.changes.patch.RelativePathCalculator;
@@ -48,10 +49,10 @@ public class ModuleVcsPathPresenter extends VcsPathPresenter {
return ApplicationManager.getApplication().runReadAction(new Computable<String>() {
@Override
public String compute() {
- ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject)
- .getFileIndex();
- Module module = fileIndex.getModuleForFile(file);
- VirtualFile contentRoot = fileIndex.getContentRootForFile(file);
+ ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject).getFileIndex();
+ boolean hideExcludedFiles = Registry.is("ide.hide.excluded.files");
+ Module module = fileIndex.getModuleForFile(file, hideExcludedFiles);
+ VirtualFile contentRoot = fileIndex.getContentRootForFile(file, hideExcludedFiles);
if (module == null || contentRoot == null) return file.getPresentableUrl();
StringBuffer result = new StringBuffer();
result.append("[");