From bf5ab3c8d7a4c30fd7294261056f04ee10288297 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Fri, 29 Dec 2017 14:29:36 +0300 Subject: [PATCH] fix NPE while searching in empty JBIterable --- .../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 55f2e50bf77d..6964f0a7d18b 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 @@ -146,10 +146,10 @@ public class ProjectViewDirectoryHelper { if (settings == null) return false; // unexpected if (!settings.isFlattenPackages() && settings.isHideEmptyMiddlePackages()) { if (element instanceof PsiDirectory) { - if (getParents(directory, owner).first(dir -> Comparing.equal(element, dir)) != null) return true; + if (getParents(directory, owner).find(dir -> Comparing.equal(element, dir)) != null) return true; } else if (element instanceof VirtualFile) { - if (getParents(directory, owner).first(dir -> Comparing.equal(element, dir.getVirtualFile())) != null) return true; + if (getParents(directory, owner).find(dir -> Comparing.equal(element, dir.getVirtualFile())) != null) return true; } } }