From c0d30385edaf05e37cc59c8e3e894b6c16c97dad Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 5 Dec 2017 13:29:07 +0300 Subject: [PATCH] project view: fix IAE if top-level file is a content root (IDEA-183236) --- .../projectView/impl/nodes/ProjectViewDirectoryHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewDirectoryHelper.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewDirectoryHelper.java index 45d8f38e6d15..4197e15f0feb 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewDirectoryHelper.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewDirectoryHelper.java @@ -254,8 +254,8 @@ public class ProjectViewDirectoryHelper { } - private static boolean isFileUnderContentRoot(DirectoryIndex index, VirtualFile file) { - return index.getInfoForFile(file).getContentRoot() != null; + private static boolean isFileUnderContentRoot(DirectoryIndex index, @Nullable VirtualFile file) { + return file != null && index.getInfoForFile(file).getContentRoot() != null; } private PsiElement[] directoryChildrenInProject(PsiDirectory psiDirectory, final ViewSettings settings) {