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

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-03-09 16:29:19 +03:00
parent 2c52eb3033
commit 35dfe0a4d8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+10 -4
View File
@@ -37,6 +37,7 @@ import com.intellij.util.QueryExecutor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashMap;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
@@ -100,7 +101,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
final VirtualFile jarFile = getJarFile(aClass);
for (List<PsiClass> sameNamedClasses : classes.values()) {
ProgressManager.checkCanceled();
if (!processSameNamedClasses(consumer, sameNamedClasses, jarFile)) return false;
if (!processSameNamedClasses(sameNamedClasses, jarFile, consumer)) return false;
}
}
@@ -135,11 +136,16 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
return true;
}
private static boolean checkInheritance(final DirectClassInheritorsSearch.SearchParameters p, final PsiClass aClass, final PsiClass candidate, Project project) {
private static boolean checkInheritance(@NotNull DirectClassInheritorsSearch.SearchParameters p,
@NotNull PsiClass aClass,
@NotNull PsiClass candidate,
@NotNull Project project) {
return MethodUsagesSearcher.resolveInReadAction(project, () -> !p.isCheckInheritance() || candidate.isInheritor(aClass, false));
}
private static boolean processSameNamedClasses(Processor<PsiClass> consumer, List<PsiClass> sameNamedClasses, final VirtualFile jarFile) {
private static boolean processSameNamedClasses(@NotNull List<PsiClass> sameNamedClasses,
@Nullable VirtualFile jarFile,
@NotNull Processor<PsiClass> consumer) {
// if there is a class from the same jar, prefer it
boolean sameJarClassFound = false;
@@ -157,7 +163,7 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
return sameJarClassFound || ContainerUtil.process(sameNamedClasses, consumer);
}
private static VirtualFile getJarFile(final PsiClass aClass) {
private static VirtualFile getJarFile(@NotNull PsiClass aClass) {
return ApplicationManager.getApplication().runReadAction((Computable<VirtualFile>)() -> PsiUtil.getJarFile(aClass));
}
}