From e2a491e37c8a246abf5ed00a45aaf24943f6a86b Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Fri, 29 Dec 2017 15:22:00 +0300
Subject: [PATCH] do not add owner if it is only one parent

---
 .../ide/projectView/impl/nodes/ProjectViewDirectoryHelper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 6964f0a7d18b..d65ebe5e1f47 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
@@ -175,8 +175,9 @@ public class ProjectViewDirectoryHelper {
 
   @NotNull
   private static JBIterable<PsiDirectory> getParents(PsiDirectory directory, Object owner) {
+    if (directory != null) directory = directory.getParent(); // because JBIterable adds first parent without comparing with owner
     return directory != null && owner instanceof PsiDirectory && PsiTreeUtil.isAncestor((PsiDirectory)owner, directory, true)
-           ? JBIterable.generate(directory.getParent(), PsiDirectory::getParent).takeWhile(dir -> dir != null && !dir.equals(owner))
+           ? JBIterable.generate(directory, PsiDirectory::getParent).takeWhile(dir -> dir != null && !dir.equals(owner))
            : JBIterable.empty();
   }