From c7980d3d88c376fd73ac370b5ed759267f2bc2f6 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Mon, 1 Dec 2014 18:07:25 +0300
Subject: [PATCH] [vcs-log] intersect structure and root filters (seems to make
 more sense, since they live together in the panel and all)

---
 .../vcs/log/data/VcsLogFileFilter.java        | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java
index 82ab7a999eba..d95bce01fd28 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogFileFilter.java
@@ -99,17 +99,22 @@ public class VcsLogFileFilter implements VcsLogFilter {
   private static Set<VirtualFile> getAllVisibleRoots(@NotNull Collection<VirtualFile> roots, @Nullable VcsLogRootFilter rootFilter, @Nullable VcsLogStructureFilter structureFilter) {
     if (rootFilter == null && structureFilter == null) return new HashSet<VirtualFile>(roots);
 
-    // should not we, like, intersect here?
-    Set<VirtualFile> result = new HashSet<VirtualFile>();
+    Collection<VirtualFile> fromRootFilter;
     if (rootFilter != null) {
-      result.addAll(rootFilter.getRoots());
-    }
-    if (structureFilter != null) {
-      Pair<Set<VirtualFile>, MultiMap<VirtualFile, VirtualFile>> rootsAndFiles = collectRoots(structureFilter.getFiles(), new HashSet<VirtualFile>(roots));
-      result.addAll(ContainerUtil.union(rootsAndFiles.first, rootsAndFiles.second.keySet()));
+      fromRootFilter = rootFilter.getRoots();
+    } else {
+      fromRootFilter = roots;
     }
 
-    return result;
+    Collection<VirtualFile> fromStructureFilter;
+    if (structureFilter != null) {
+      Pair<Set<VirtualFile>, MultiMap<VirtualFile, VirtualFile>> rootsAndFiles = collectRoots(structureFilter.getFiles(), new HashSet<VirtualFile>(roots));
+      fromStructureFilter = ContainerUtil.union(rootsAndFiles.first, rootsAndFiles.second.keySet());
+    } else {
+      fromStructureFilter = roots;
+    }
+
+    return new HashSet<VirtualFile>(ContainerUtil.intersection(fromRootFilter, fromStructureFilter));
   }
 
   // for given root returns files that are selected in it