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

[java] NPE on composing module entry fixes (IDEA-164553)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-11-25 20:03:33 +01:00
parent 1bc5815976
commit 7744df770b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java
+4 -2
View File
@@ -158,7 +158,8 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
.collect(Collectors.toList());
Set<Module> modules = targets.stream()
.map(e -> !(e instanceof PsiCompiledElement) ? e.getContainingFile().getVirtualFile() : null)
.map(e -> !(e instanceof PsiCompiledElement) ? e.getContainingFile() : null)
.map(f -> f != null ? f.getVirtualFile() : null)
.filter(vf -> vf != null && index.isInSource(vf))
.map(vf -> index.getModuleForFile(vf))
.filter(m -> m != null && m != currentModule)
@@ -168,7 +169,8 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix {
}
targets.stream()
.map(e -> e instanceof PsiCompiledElement ? e.getContainingFile().getVirtualFile() : null)
.map(e -> e instanceof PsiCompiledElement ? e.getContainingFile() : null)
.map(f -> f != null ? f.getVirtualFile() : null)
.flatMap(vf -> vf != null ? index.getOrderEntriesForFile(vf).stream() : Stream.empty())
.map(e -> e instanceof LibraryOrderEntry ? ((LibraryOrderEntry)e).getLibrary() : null)
.filter(Objects::nonNull)