From 376c3ba1bd600cd00bcd923df7c4a3c8bb520d97 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Sun, 13 Dec 2020 20:32:58 +0100 Subject: [PATCH] [platform] ignoring invalid files in "reload from disk" action - NPE fix (EA-247223) GitOrigin-RevId: 59ae1e7f7dfe4dd8008b28d813438d91af93b1f8 --- .../com/intellij/ide/actions/SynchronizeCurrentFileAction.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java index 2da36beefb6b..a3d8913fd67c 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/SynchronizeCurrentFileAction.java @@ -51,6 +51,7 @@ public class SynchronizeCurrentFileAction extends AnAction implements DumbAware } private static Stream localFiles(AnActionEvent e) { - return Stream.of(e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY)).filter(f -> f.isValid() && f.isInLocalFileSystem()); + VirtualFile[] files = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY); + return files != null ? Stream.of(files).filter(f -> f.isValid() && f.isInLocalFileSystem()) : Stream.empty(); } }