From 9acb0afe8e8087c35e4db8f16ed3f92729db81b2 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 12 Jul 2016 20:02:01 +0300
Subject: [PATCH] extract hasInvalidFiles() to VfsUtil

---
 .../src/com/intellij/openapi/vfs/VfsUtilCore.java     |  9 +++++++++
 .../util/indexing/AdditionalIndexableFileSet.java     | 11 +----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
index ebe812819b61..2868e00897b8 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
@@ -663,6 +663,15 @@ public class VfsUtilCore {
     return components;
   }
 
+  public static boolean hasInvalidFiles(@NotNull Iterable<VirtualFile> files) {
+    for (VirtualFile file : files) {
+      if (!file.isValid()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /**
    * this collection will keep only distinct files/folders, e.g. C:\foo\bar will be removed when C:\foo is added
    */
diff --git a/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java b/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java
index f08d23cf143e..e2adf3250ced 100644
--- a/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java
+++ b/platform/indexing-impl/src/com/intellij/util/indexing/AdditionalIndexableFileSet.java
@@ -55,7 +55,7 @@ public class AdditionalIndexableFileSet implements IndexableFileSet {
 
   private Set<VirtualFile> getDirectories() {
     Set<VirtualFile> directories = cachedDirectories;
-    if (directories == null || filesInvalidated(directories) || filesInvalidated(cachedFiles)) {
+    if (directories == null || VfsUtilCore.hasInvalidFiles(directories) || VfsUtilCore.hasInvalidFiles(cachedFiles)) {
       directories = collectFilesAndDirectories();
     }
     return directories;
@@ -83,15 +83,6 @@ public class AdditionalIndexableFileSet implements IndexableFileSet {
     return directories;
   }
 
-  public static boolean filesInvalidated(Set<VirtualFile> files) {
-    for (VirtualFile file : files) {
-      if (!file.isValid()) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   @Override
   public boolean isInSet(@NotNull VirtualFile file) {
     return VfsUtilCore.isUnder(file, getDirectories()) || cachedFiles.contains(file);