MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

assert that files returned by IndexableSetContributor are valid

Browse Source
This commit is contained in:
peter
2015-11-04 15:48:01 +01:00
parent 1de66b0300
commit 55cbac2741
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-api/src/com/intellij/util/indexing/IndexableSetContributor.java
+12 -7
View File
@@ -17,6 +17,7 @@ package com.intellij.util.indexing;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.util.NotNullFunction;
@@ -74,7 +75,7 @@ public abstract class IndexableSetContributor implements IndexedRootsProvider {
/**
* @return an additional project-dependent set of {@link VirtualFile} instances to index,
* the returned set should not contain nulls
* the returned set should not contain nulls or invalid files
*/
@NotNull
public Set<VirtualFile> getAdditionalProjectRootsToIndex(@NotNull Project project) {
@@ -83,7 +84,7 @@ public abstract class IndexableSetContributor implements IndexedRootsProvider {
/**
* @return an additional project-independent set of {@link VirtualFile} instances to index,
* the returned set should not contain nulls
* the returned set should not contain nulls or invalid files
*/
@NotNull
public abstract Set<VirtualFile> getAdditionalRootsToIndex();
@@ -93,12 +94,16 @@ public abstract class IndexableSetContributor implements IndexedRootsProvider {
@NotNull String methodInfo,
@NotNull Set<VirtualFile> roots) {
for (VirtualFile root : roots) {
if (root == null) {
if (root == null || !root.isValid()) {
LOG.error("Please fix " + contributor.getClass().getName() + "#" + methodInfo + ".\n" +
"The returned set is not expected to contain nulls, but it is " + roots);
Set<VirtualFile> result = ContainerUtil.newHashSet(roots.size());
ContainerUtil.addAllNotNull(result, roots);
return result;
(root == null ? "The returned set is not expected to contain nulls, but it is " + roots
: "Invalid file returned: " + root));
return ContainerUtil.newLinkedHashSet(ContainerUtil.filter(roots, new Condition<VirtualFile>() {
@Override
public boolean value(VirtualFile virtualFile) {
return virtualFile != null && virtualFile.isValid();
}
}));
}
}
return roots;