extract hasInvalidFiles() to VfsUtil

This commit is contained in:
Gregory.Shrago
2016-07-12 20:02:01 +03:00
parent 06ed3f5f2a
commit 9acb0afe8e
2 changed files with 10 additions and 10 deletions
@@ -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
*/
@@ -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);