From 78e79503a2b26cbe1f1e9dcd0f389e65ded06625 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Wed, 30 May 2018 16:14:35 +0300
Subject: [PATCH] svn: Remove not svn items from "SvnVcs.filterUniqueRoots()"
 results

IDEA-CR-32834
---
 .../svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java   | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index e35ae7cfcf96..95d9ba17ed75 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -32,7 +32,6 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.openapi.vfs.newvfs.impl.NullVirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.util.ThreeState;
 import com.intellij.util.containers.ContainerUtil;
@@ -78,7 +77,6 @@ import java.util.Map;
 import java.util.function.Function;
 
 import static com.intellij.openapi.vfs.VfsUtilCore.virtualToIoFile;
-import static com.intellij.util.ObjectUtils.notNull;
 import static com.intellij.util.containers.ContainerUtil.*;
 import static java.util.Collections.emptyList;
 import static java.util.function.Function.identity;
@@ -761,18 +759,15 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
               .mapToEntry(
                 file -> {
                   RootUrlInfo wcRoot = getSvnFileUrlMapping().getWcRootForFilePath(virtualToIoFile(file));
-                  VirtualFile wcRootFile = wcRoot != null ? wcRoot.getVirtualFile() : SvnUtil.getWorkingCopyRoot(file);
-
-                  return notNull(wcRootFile, NullVirtualFile.INSTANCE);
+                  return wcRoot != null ? wcRoot.getVirtualFile() : SvnUtil.getWorkingCopyRoot(file);
                 },
                 identity())
+              .nonNullKeys()
               .grouping();
 
     return EntryStream.of(byWorkingCopy)
                       .flatMapToValue((workingCopy, files) -> {
-                        if (!NullVirtualFile.INSTANCE.equals(workingCopy)) {
-                          FilterDescendantVirtualFiles.filter(files);
-                        }
+                        FilterDescendantVirtualFiles.filter(files);
                         return files.stream();
                       })
                       .values()