From 7744df770b5c13e8d5edc95cabfc9c7c59ce0508 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 25 Nov 2016 20:03:18 +0100 Subject: [PATCH] [java] NPE on composing module entry fixes (IDEA-164553) --- .../codeInsight/daemon/impl/quickfix/OrderEntryFix.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java index db8ce9e740a4..13571b4dc8de 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java @@ -158,7 +158,8 @@ public abstract class OrderEntryFix implements IntentionAction, LocalQuickFix { .collect(Collectors.toList()); Set 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)